dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

don't add /GX to defenv

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4326 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2005-10-13 13:33:28 +00:00
parent 8507a9027d
commit e1d65c2150
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
SCons/Config/ms
View file

@ -25,7 +25,8 @@ if defenv['DEBUG']:
# if stl usage causes link failure, copy the good libcp.lib # if stl usage causes link failure, copy the good libcp.lib
# from one of the other lib folders and use it instead. # from one of the other lib folders and use it instead.
conf = defenv.Configure() confenv = defenv.Copy()
conf = confenv.Configure()
libcptest = """ libcptest = """
#include <fstream> #include <fstream>
@ -50,6 +51,7 @@ if not conf.TryLink(libcptest % 'no change', '.cpp'):
libcp = r'%s\libcp.lib' % libdir libcp = r'%s\libcp.lib' % libdir
shutil.copy(libcp, Dir('#/.sconf_temp').abspath) shutil.copy(libcp, Dir('#/.sconf_temp').abspath)
if conf.TryLink(libcptest % (r'using %s' % libcp), '.cpp'): if conf.TryLink(libcptest % (r'using %s' % libcp), '.cpp'):
defenv.PrependENVPath('LIB', Dir('#/.sconf_temp').abspath)
break break
except IOError: except IOError:
continue continue