anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Scons: two small bug fixes, and a bit more about msvc

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13975 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Bo Peng 2006-06-01 03:01:46 +00:00
parent 98a75b6456
commit 79237ec01c
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
development/scons/SConscript
View File

@ -58,7 +58,7 @@ if rebuild_targets:
# sync frontend and env['frontend'] (maybe build qt4 with frontend=qt3)
if build_qt3:
frontend = 'qt3'
env['frontend'] = 'qt4'
env['frontend'] = 'qt3'
elif build_qt4:
frontend = 'qt4'
env['frontend'] = 'qt4'
@ -145,7 +145,7 @@ if build_intl:
intlenv = env.Copy()
# we need the original C compiler for these files
intlenv['CC'] = intlenv['C_COMPILER']
intlenv['CCFLAGS'] = intlenv['C_CCFLAGS']
intlenv['CCFLAGS'] = intlenv['C_CCFLAGS'].split()
intlenv['CPPPATH'] += ['intl']
intlenv.Append(CCFLAGS = [

14
development/scons/SConstruct
View File

@ -521,6 +521,9 @@ else:
# in the current code page (number)
# C4996: foo was decleared deprecated
env.Append(CCFLAGS=['/TP', '/EHsc', '/wd4819', '/wd4996'])
env['LINKFLAGS'] = [env['LINKFLAGS'], '/MANIFEST']
env['LINKCOM' ] = [env['LINKCOM'], 'mt /manifest ${TARGET}.manifest /outputresource:$TARGET']
env['SHLINKCOM'] = [env['SHLINKCOM'], 'mt /manifest ${TARGET}.manifest -outputresource:$TARGET;#2']
#----------------------------------------------------------
@ -551,8 +554,10 @@ else:
env['HAS_PKG_CONFIG'] = env_cache['HAS_PKG_CONFIG']
# zlib? This is required. (fast_start assumes the existance of zlib)
if not fast_start and not conf.CheckLibWithHeader('z', 'zlib.h', 'C'):
print 'Did not find libz or zlib.h, exiting!'
if not fast_start:
if (not use_vc and not conf.CheckLibWithHeader('z', 'zlib.h', 'C')) \
or (use_vc and not conf.CheckLibWithHeader('zdll', 'zlib.h', 'C')):
print 'Did not find zdll.lib or zlib.h, exiting!'
Exit(1)
# qt libraries?
@ -1124,11 +1129,10 @@ except:
if platform_name in ['win32', 'cygwin']:
# the final link step needs stdc++ to succeed under mingw
# FIXME: shouldn't g++ automatically link to stdc++?
env['SYSTEM_LIBS'] = ['shlwapi', 'z']
if use_vc:
env['SYSTEM_LIBS'].extend(['gdi32', 'shell32', 'advapi32'])
env['SYSTEM_LIBS'] = ['shlwapi', 'gdi32', 'shell32', 'advapi32', 'zdll']
else:
env['SYSTEM_LIBS'].append('stdc++')
env['SYSTEM_LIBS'] = ['shlwapi', 'stdc++', 'z']
else:
env['SYSTEM_LIBS'] = ['z']