From df2a7ce233fe756ec0b7f6750a7ceae4ef75aaa4 Mon Sep 17 00:00:00 2001 From: kichik Date: Sat, 16 Jul 2005 10:09:17 +0000 Subject: [PATCH] add $MAP_FLAG to all envs git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4172 212acab6-be3b-0410-9dea-997c60f758d6 --- SCons/Config/gnu | 4 ++++ SCons/Config/ms | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/SCons/Config/gnu b/SCons/Config/gnu index 2e6016e2..c59977f4 100644 --- a/SCons/Config/gnu +++ b/SCons/Config/gnu @@ -44,6 +44,7 @@ stub_env.Append(LINKFLAGS = '-mwindows') # build windows executables stub_env.Append(LINKFLAGS = '$NODEFLIBS_FLAG') # no standard libraries stub_env.Append(LINKFLAGS = '$ALIGN_FLAG') # 512 bytes align stub_env.Append(LINKFLAGS = '-Wl,-e,_WinMain@16') # entry point +stub_env.Append(LINKFLAGS = '$MAP_FLAG') # generate map file ### makensis environment @@ -53,6 +54,7 @@ makensis_env.Append(CCFLAGS = '-O2') # optimize makensis_env.Append(CCFLAGS = '-Wall') # all warnings makensis_env.Append(LINKFLAGS = '-s') # strip +makensis_env.Append(LINKFLAGS = '$MAP_FLAG') # generate map file ### plugin environment @@ -64,6 +66,7 @@ plugin_env.Append(CCFLAGS = '-Wall') # level 3 warnings plugin_env.Append(LINKFLAGS = '-s') # strip plugin_env.Append(LINKFLAGS = '$ALIGN_FLAG') # 512 bytes align +plugin_env.Append(LINKFLAGS = '$MAP_FLAG') # generate map file ### util environment @@ -76,6 +79,7 @@ util_env.Append(CCFLAGS = '-Wall') # all warnings util_env.Append(LINKFLAGS = '-s') # strip util_env.Append(LINKFLAGS = '-mwindows') # build windows executables util_env.Append(LINKFLAGS = '$ALIGN_FLAG') # 512 bytes align +util_env.Append(LINKFLAGS = '$MAP_FLAG') # generate map file ### weird GCC requirements diff --git a/SCons/Config/ms b/SCons/Config/ms index 60e72bd0..8a957599 100644 --- a/SCons/Config/ms +++ b/SCons/Config/ms @@ -30,6 +30,7 @@ stub_env.Append(CCFLAGS = '/W3') # level 3 warnings stub_env.Append(LINKFLAGS = '/opt:nowin98') # 512 bytes align stub_env.Append(LINKFLAGS = '/entry:WinMain') # entry point stub_env.Append(LINKFLAGS = '/NODEFAULTLIB') # no default libraries +stub_env.Append(LINKFLAGS = '$MAP_FLAG') # generate map file ### makensis environment @@ -41,6 +42,7 @@ makensis_env.Append(CCFLAGS = '/GX') # enable exceptions makensis_env.Append(CCFLAGS = '/W3') # level 3 warnings makensis_env.Append(LINKFLAGS = '/opt:nowin98') # 512 bytes align +makensis_env.Append(LINKFLAGS = '$MAP_FLAG') # generate map file ### plugin environment @@ -51,6 +53,7 @@ if not defenv['DEBUG']: plugin_env.Append(CCFLAGS = '/W3') # level 3 warnings plugin_env.Append(LINKFLAGS = '/opt:nowin98') # 512 bytes align +plugin_env.Append(LINKFLAGS = '$MAP_FLAG') # generate map file ### util environment @@ -61,6 +64,7 @@ if not defenv['DEBUG']: util_env.Append(CCFLAGS = '/W3') # level 3 warnings util_env.Append(LINKFLAGS = '/opt:nowin98') # 512 bytes align +util_env.Append(LINKFLAGS = '$MAP_FLAG') # generate map file # return