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

scons 1.1.0 support

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5767 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2008-11-15 21:54:24 +00:00
parent 26517fe8a3
commit c8884e0988
5 changed files with 782 additions and 782 deletions
Download patch file Download diff file Expand all files Collapse all files

54
SCons/Config/ms
View file

@ -15,7 +15,7 @@ defenv['MSVCRT_FLAG'] = '/MD'
if float(defenv['MSVS_VERSION'].replace('Exp','')) >= 8.0:
defenv['EXCEPTION_FLAG'] = '/EHsc'
defenv.Append(CCFLAGS = '/GS-')
defenv.Append(CCFLAGS = ['/GS-'])
defenv.Append(CPPDEFINES = ['_CRT_SECURE_NO_WARNINGS', '_CRT_NONSTDC_NO_WARNINGS'])
else:
defenv['EXCEPTION_FLAG'] = '/GX'
@ -23,9 +23,9 @@ else:
### debug
if defenv['DEBUG']:
defenv.Append(CCFLAGS = '/Zi')
defenv.Append(CCFLAGS = '/Fd${TARGET.dir}\\${TARGET.dir.file}.pdb')
defenv.Append(LINKFLAGS = '/debug')
defenv.Append(CCFLAGS = ['/Zi'])
defenv.Append(CCFLAGS = ['/Fd${TARGET.dir}\\${TARGET.dir.file}.pdb'])
defenv.Append(LINKFLAGS = ['/debug'])
### workarounds
@ -73,49 +73,49 @@ conf.Finish()
stub_env = defenv.Clone()
if not defenv['DEBUG']:
stub_env.Append(CCFLAGS = '/O1') # optimize for size
stub_env.Append(CCFLAGS = '/W3') # level 3 warnings
stub_env.Append(CCFLAGS = ['/O1']) # optimize for size
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 = '$NODEFLIBS_FLAG') # no default libraries
stub_env.Append(LINKFLAGS = '$MAP_FLAG') # generate map file
stub_env.Append(CCFLAGS = '/FAcs') # full listing files
stub_env.Append(CCFLAGS = '/Fa${TARGET}.lst') # listing file name
stub_env.Append(LINKFLAGS = ['/opt:nowin98']) # 512 bytes align
stub_env.Append(LINKFLAGS = ['/entry:WinMain']) # entry point
stub_env.Append(LINKFLAGS = ['$NODEFLIBS_FLAG']) # no default libraries
stub_env.Append(LINKFLAGS = ['$MAP_FLAG']) # generate map file
stub_env.Append(CCFLAGS = ['/FAcs']) # full listing files
stub_env.Append(CCFLAGS = ['/Fa${TARGET}.lst']) # listing file name
### makensis environment
makensis_env = defenv.Clone()
if not defenv['DEBUG']:
makensis_env.Append(CCFLAGS = '/O2') # optimize for speed
makensis_env.Append(CCFLAGS = '$EXCEPTION_FLAG') # enable exceptions
makensis_env.Append(CCFLAGS = '/W3') # level 3 warnings
makensis_env.Append(CCFLAGS = ['/O2']) # optimize for speed
makensis_env.Append(CCFLAGS = ['$EXCEPTION_FLAG']) # 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
makensis_env.Append(LINKFLAGS = ['/opt:nowin98']) # 512 bytes align
makensis_env.Append(LINKFLAGS = ['$MAP_FLAG']) # generate map file
### plugin environment
plugin_env = defenv.Clone(no_import_lib = 1)
if not defenv['DEBUG']:
plugin_env.Append(CCFLAGS = '/O1') # optimize for size
plugin_env.Append(CCFLAGS = '/W3') # level 3 warnings
plugin_env.Append(CCFLAGS = ['/O1']) # optimize for size
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
plugin_env.Append(LINKFLAGS = ['/opt:nowin98']) # 512 bytes align
plugin_env.Append(LINKFLAGS = ['$MAP_FLAG']) # generate map file
### util environment
util_env = defenv.Clone()
if not defenv['DEBUG']:
util_env.Append(CCFLAGS = '/O1') # optimize for speed
util_env.Append(CCFLAGS = '/W3') # level 3 warnings
util_env.Append(CCFLAGS = ['/O1']) # optimize for speed
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
util_env.Append(LINKFLAGS = ['/opt:nowin98']) # 512 bytes align
util_env.Append(LINKFLAGS = ['$MAP_FLAG']) # generate map file
### cross-platform util environment
@ -132,8 +132,8 @@ def check_requirement(ctx, func, trigger):
flags = ctx.env['LINKFLAGS']
ctx.env.Append(LINKFLAGS = '$NODEFLIBS_FLAG')
ctx.env.Append(LINKFLAGS = '${ENTRY_FLAG("main")}')
ctx.env.Append(LINKFLAGS = ['$NODEFLIBS_FLAG'])
ctx.env.Append(LINKFLAGS = ['/entry:main'])
test = """
int main() {