From b9cbb026393c62d050abdedcb47f25613ae562c8 Mon Sep 17 00:00:00 2001 From: Bo Peng Date: Mon, 27 Aug 2007 03:40:42 +0000 Subject: [PATCH] Scons cleanup 6: build minizip/iowin32.c on all sytems becuase it is surrounded by #ifdef WIN32, some other small cleanups git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19822 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/scons/SConstruct | 5 ++--- development/scons/scons_manifest.py | 4 +--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/development/scons/SConstruct b/development/scons/SConstruct index 3ab01eee82..fede93fdf4 100644 --- a/development/scons/SConstruct +++ b/development/scons/SConstruct @@ -1516,8 +1516,7 @@ Package_cpp = env.substFile('$BUILDDIR/src/support/Package.cpp', '$TOP_SRCDIR/sr support = frontend_env.StaticLibrary( target = '$LOCALLIBPATH/support', source = ['$BUILDDIR/src/support/%s' % x for x in src_support_files] + Package_cpp + \ - ['$BUILDDIR/src/support/minizip/%s' % x for x in src_support_minizip_files] + \ - ['$BUILDDIR/src/support/minizip/%s' % x for x in src_support_minizip_windows_files if platform_name == 'win32'], + ['$BUILDDIR/src/support/minizip/%s' % x for x in src_support_minizip_files], CCFLAGS = [ '$CCFLAGS', '-DHAVE_CONFIG_H', @@ -1759,7 +1758,7 @@ if use_vc and 'msvs_projects' in BUILD_TARGETS: ['$TOP_SRCDIR/src/frontends/%s' % x for x in src_frontends_files] + \ ['$TOP_SRCDIR/src/graphics/%s' % x for x in src_graphics_files] + \ ['$TOP_SRCDIR/src/frontends/controllers/%s' % x for x in src_frontends_controllers_files] + \ - ['$TOP_SRCDIR/src/frontends/qt4/%s' % x for x in src_frontends_qt4_files + src_frontends_qt4_moc_files], + ['$TOP_SRCDIR/src/frontends/qt4/%s' % x for x in src_frontends_qt4_files], inc = ['$TOP_SRCDIR/src/%s' % x for x in src_header_files] + \ ['$TOP_SRCDIR/src/support/%s' % x for x in src_support_header_files] + \ ['$TOP_SRCDIR/src/mathed/%s' % x for x in src_mathed_header_files] + \ diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py index 56798aa829..14a0691022 100644 --- a/development/scons/scons_manifest.py +++ b/development/scons/scons_manifest.py @@ -425,14 +425,12 @@ src_support_minizip_header_files = Split(''' src_support_minizip_files = Split(''' ioapi.c + iowin32.c zip.c unzip.c ''') -src_support_minizip_windows_files = ['iowin32.c'] - - src_graphics_header_files = Split(''' GraphicsCache.h GraphicsCacheItem.h -- 2.39.5