applied patch #1758863 - Patch for building on GCC and aCC

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5217 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2007-07-23 18:43:07 +00:00
parent 243c1b9920
commit 8e716ed458
10 changed files with 50 additions and 49 deletions

View file

@ -82,7 +82,7 @@ makensis_env = defenv.Clone()
if not defenv['DEBUG']:
makensis_env.Append(CCFLAGS = '-O2') # optimize
makensis_env.Append(CCFLAGS = '-Wall') # all warnings
makensis_env.Append(CCFLAGS = '-Wno-non-virtual-dtor') # ignore virtual dtor warnings
makensis_env.Append(CXXFLAGS = '-Wno-non-virtual-dtor') # ignore virtual dtor warnings
conf = FlagsConfigure(makensis_env)
conf.CheckLinkFlag('-m32') #

View file

@ -29,9 +29,11 @@ makensis_env.Append(CFLAGS = '-Ae')
### required to build makensis
makensis_env.Append(LINKFLAGS = '-AA')
makensis_env.Append(LINKFLAGS = '+DD32')
makensis_env.Append(LINKFLAGS = '-mt')
makensis_env.Append(CXXFLAGS = '-AA')
makensis_env.Append(CCFLAGS = '+DD32')
makensis_env.Append(CCFLAGS = '-mt')