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

* Basic System::Call support when compiling with 64-bit MinGW/GCC toolchain

Browse source 
* Win64 fixes


git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6607 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2015-09-17 14:30:07 +00:00
parent 757d16f937
commit 286edd20c4
41 changed files with 335 additions and 232 deletions
Download patch file Download diff file Expand all files Collapse all files

15
SCons/utils.py
View file

@ -118,4 +118,17 @@ def FlagsConfigure(env):
"""
return env.Configure(custom_tests = { 'CheckCompileFlag' : check_compile_flag, 'CheckLinkFlag': check_link_flag })
Export('AddAvailableLibs AddZLib FlagsConfigure GetAvailableLibs')
def GetOptionOrEnv(name, defval = None):
"""
Get option set on scons command line or in os.environ
"""
import os
#if optenv and optenv.has_key(name):
# return optenv[name]
if ARGUMENTS.has_key(name):
return ARGUMENTS[name]
if os.environ.has_key(name):
return os.environ[name]
return defval
Export('AddAvailableLibs AddZLib FlagsConfigure GetAvailableLibs GetOptionOrEnv')