anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-24 17:09:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Scons cleanup 6: build minizip/iowin32.c on all sytems becuase it is surrounded by #ifdef WIN32, some other small cleanups

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19822 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Bo Peng 2007-08-27 03:40:42 +00:00
parent 8786658cca
commit b9cbb02639
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
development/scons/SConstruct
View File

@ -1516,8 +1516,7 @@ Package_cpp = env.substFile('$BUILDDIR/src/support/Package.cpp', '$TOP_SRCDIR/sr
support = frontend_env.StaticLibrary( support = frontend_env.StaticLibrary(
target = '$LOCALLIBPATH/support', target = '$LOCALLIBPATH/support',
source = ['$BUILDDIR/src/support/%s' % x for x in src_support_files] + Package_cpp + \ 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_files],
['$BUILDDIR/src/support/minizip/%s' % x for x in src_support_minizip_windows_files if platform_name == 'win32'],
CCFLAGS = [ CCFLAGS = [
'$CCFLAGS', '$CCFLAGS',
'-DHAVE_CONFIG_H', '-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/frontends/%s' % x for x in src_frontends_files] + \
['$TOP_SRCDIR/src/graphics/%s' % x for x in src_graphics_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/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] + \ 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/support/%s' % x for x in src_support_header_files] + \
['$TOP_SRCDIR/src/mathed/%s' % x for x in src_mathed_header_files] + \ ['$TOP_SRCDIR/src/mathed/%s' % x for x in src_mathed_header_files] + \

4
development/scons/scons_manifest.py
View File

@ -425,14 +425,12 @@ src_support_minizip_header_files = Split('''
src_support_minizip_files = Split(''' src_support_minizip_files = Split('''
ioapi.c ioapi.c
iowin32.c
zip.c zip.c
unzip.c unzip.c
''') ''')
src_support_minizip_windows_files = ['iowin32.c']
src_graphics_header_files = Split(''' src_graphics_header_files = Split('''
GraphicsCache.h GraphicsCache.h
GraphicsCacheItem.h GraphicsCacheItem.h