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

only use /FIXED for stubs and especially not for DLLs

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6570 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2014-12-04 07:15:01 +00:00
parent 6ea16bd7fa
commit b9d125c881
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
SCons/Config/ms
View file

@ -38,8 +38,6 @@ if msvs_version < 10.0:
defenv.Append(LINKFLAGS = ['/opt:nowin98'])
if defenv['MSTOOLKIT'] and msvs_version < 8.0:
defenv['MSVCRT_FLAG'] = '/ML' # TK2003 does not have all libs
if msvs_version >= 10.0:
defenv.Append(LINKFLAGS = ['/FIXED']) # no relocations that our resource editor ignores
if msvs_version >= 11.0:
defenv['SUBSYS_CON'] = '/subsystem:console,5.01' # support windows xp
defenv['SUBSYS_WIN'] = '/subsystem:windows,5.01' # support windows xp
@ -126,6 +124,10 @@ stub_env.Append(CCFLAGS = ['/Fa${TARGET}.lst']) # listing file name
stub_env.Append(LINKFLAGS = ['$NODEFLIBS_FLAG']) # no default libraries
stub_env.Append(LINKFLAGS = ['$MAP_FLAG']) # generate map file
if msvs_version >= 10.0:
# no relocations that our resource editor ignores
stub_env.Append(LINKFLAGS = ['/FIXED'])
stub_uenv = stub_env.Clone()
stub_uenv.Append(CPPDEFINES = ['_UNICODE', 'UNICODE'])