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

#1753070: Enable that makensis and its related utilities can be built natively for 64-bit systems

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6040 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
f0rt 2010-03-27 19:20:16 +00:00
parent b402798885
commit 8ab72b9ece
20 changed files with 133 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

6
SCons/Config/gnu
View file

@ -95,8 +95,6 @@ makensis_env.Append(CXXFLAGS = ['-Wno-non-virtual-dtor']) # ignore virtual dtor
makensis_env.Append(CXXFLAGS = ['-Wall']) # all warnings
conf = FlagsConfigure(makensis_env)
conf.CheckCompileFlag('-m32') #
conf.CheckLinkFlag('-m32') #
conf.CheckLinkFlag('$MAP_FLAG') # generate map file
if not defenv['DEBUG'] and defenv['STRIP'] and defenv['STRIP_CP']:
TestStrip(conf) # strip
@ -150,8 +148,6 @@ conf.Finish()
### cross-platform util environment adjustments
conf = FlagsConfigure(cp_util_env)
conf.CheckCompileFlag('-m32')
conf.CheckLinkFlag('-m32')
if not defenv['DEBUG'] and defenv['STRIP'] and defenv['STRIP_CP']:
TestStrip(conf) # strip
conf.Finish()
@ -161,8 +157,6 @@ conf.Finish()
test_env = defenv.Clone()
test_env.Append(CPPPATH = ['#$BUILD_CONFIG'])
conf = FlagsConfigure(test_env)
conf.CheckCompileFlag('-m32')
conf.CheckLinkFlag('-m32')
conf.Finish()
### weird GCC requirements