anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-20 06:49:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

scons/SConstruct: fix compiling with SCons

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33560 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2010-02-24 20:45:12 +00:00
parent 36c1de09a7
commit 056a614830
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
development/scons/SConstruct
View File

@ -411,6 +411,7 @@ if platform_name == 'win32':
# hard-coded options are required and will always be there
# default options can be replaced by enviromental variables or command line options
CCFLAGS_required = []
CXXFLAGS_required = []
LINKFLAGS_required = []
CCFLAGS_default = []
@ -420,6 +421,7 @@ if use_vc:
# in the current code page (number)
# C4996: foo was decleared deprecated
CCFLAGS_required.append('/EHsc')
CXXFLAGS_required.append('/Zc:wchar_t-')
if mode == 'debug':
CCFLAGS_default.extend(['/wd4819', '/wd4996', '/nologo', '/MDd'])
else:
@ -514,7 +516,7 @@ setEnvVariable(env, 'CPP')
setEnvVariable(env, 'CXX')
setEnvVariable(env, 'CXXCPP')
setEnvVariable(env, 'CCFLAGS', CCFLAGS_required, CCFLAGS_default)
setEnvVariable(env, 'CXXFLAGS')
setEnvVariable(env, 'CXXFLAGS', CXXFLAGS_required)
setEnvVariable(env, 'CPPFLAGS')
setEnvVariable(env, 'LINKFLAGS', LINKFLAGS_required)
@ -832,10 +834,10 @@ else:
# check the size of wchar_t
sizeof_wchar_t = conf.CheckSizeOfWChar()
# something wrong
if sizeof_wchar_t == 0:
print 'Error: Can not determine the size of wchar_t.'
print 'Please check config.log for more information.'
Exit(1)
#if sizeof_wchar_t == 0:
# print 'Error: Can not determine the size of wchar_t.'
# print 'Please check config.log for more information.'
# Exit(1)
# fill in the version info