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

Make sure SubStart is a CLI app (MinGW/GNU config bug)

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6181 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2011-11-19 19:53:59 +00:00
parent 0617c9d3e7
commit 020864c3da
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Contrib/SubStart/SConscript
View file

@ -11,6 +11,6 @@ libs = Split("""
Import('BuildUtil') Import('BuildUtil')
substart = BuildUtil(target, files, libs) substart = BuildUtil(target, files, libs, cli = True)
env.DistributeBin(substart, names=['makensis.exe'], alias='install-compiler') # install as makensis env.DistributeBin(substart, names=['makensis.exe'], alias='install-compiler') # install as makensis

9
SConstruct
View file

@ -647,7 +647,7 @@ Import('AddZLib')
def BuildUtilEnv(defines = None, flags = None, libs = None, def BuildUtilEnv(defines = None, flags = None, libs = None,
entry = None, nodeflib = None, entry = None, nodeflib = None,
cross_platform = False): cross_platform = False, cli = False):
if not cross_platform: if not cross_platform:
env = util_env.Clone() env = util_env.Clone()
platform = 'win32' platform = 'win32'
@ -655,6 +655,9 @@ def BuildUtilEnv(defines = None, flags = None, libs = None,
env = cp_util_env.Clone() env = cp_util_env.Clone()
platform = env['PLATFORM'] platform = env['PLATFORM']
if cli:
env.Append(LINKFLAGS = env['SUBSYS_CON'])
if libs and 'z' in libs: if libs and 'z' in libs:
libs.remove('z') libs.remove('z')
AddZLib(env, platform) AddZLib(env, platform)
@ -667,8 +670,8 @@ def BuildUtil(target, source, libs, entry = None, res = None,
resources = None, defines = None, flags = None, resources = None, defines = None, flags = None,
nodeflib = False, file_name = '', path='', contrib = False, nodeflib = False, file_name = '', path='', contrib = False,
examples = None, docs = None, cross_platform = False, examples = None, docs = None, cross_platform = False,
root_util = False): root_util = False, cli = False):
env = BuildUtilEnv(defines, flags, libs, entry, nodeflib, cross_platform) env = BuildUtilEnv(defines, flags, libs, entry, nodeflib, cross_platform, cli)
AppendRES(env, source, res, resources) AppendRES(env, source, res, resources)