From b9d125c881f9c6a4ea429a9a6d2bc63be4ef0bd2 Mon Sep 17 00:00:00 2001 From: kichik Date: Thu, 4 Dec 2014 07:15:01 +0000 Subject: [PATCH] only use /FIXED for stubs and especially not for DLLs git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6570 212acab6-be3b-0410-9dea-997c60f758d6 --- SCons/Config/ms | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/SCons/Config/ms b/SCons/Config/ms index 6a0e3790..b0507f52 100644 --- a/SCons/Config/ms +++ b/SCons/Config/ms @@ -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'])