From 020864c3daa0be07a4cc1c62d422e63c4e2f6b38 Mon Sep 17 00:00:00 2001 From: anders_k Date: Sat, 19 Nov 2011 19:53:59 +0000 Subject: [PATCH] Make sure SubStart is a CLI app (MinGW/GNU config bug) git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6181 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/SubStart/SConscript | 2 +- SConstruct | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Contrib/SubStart/SConscript b/Contrib/SubStart/SConscript index 2a8f5499..b805b484 100644 --- a/Contrib/SubStart/SConscript +++ b/Contrib/SubStart/SConscript @@ -11,6 +11,6 @@ libs = Split(""" 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 diff --git a/SConstruct b/SConstruct index 3cb9d3c2..01e668d1 100644 --- a/SConstruct +++ b/SConstruct @@ -647,7 +647,7 @@ Import('AddZLib') def BuildUtilEnv(defines = None, flags = None, libs = None, entry = None, nodeflib = None, - cross_platform = False): + cross_platform = False, cli = False): if not cross_platform: env = util_env.Clone() platform = 'win32' @@ -655,6 +655,9 @@ def BuildUtilEnv(defines = None, flags = None, libs = None, env = cp_util_env.Clone() platform = env['PLATFORM'] + if cli: + env.Append(LINKFLAGS = env['SUBSYS_CON']) + if libs and 'z' in libs: libs.remove('z') AddZLib(env, platform) @@ -667,8 +670,8 @@ def BuildUtil(target, source, libs, entry = None, res = None, resources = None, defines = None, flags = None, nodeflib = False, file_name = '', path='', contrib = False, examples = None, docs = None, cross_platform = False, - root_util = False): - env = BuildUtilEnv(defines, flags, libs, entry, nodeflib, cross_platform) + root_util = False, cli = False): + env = BuildUtilEnv(defines, flags, libs, entry, nodeflib, cross_platform, cli) AppendRES(env, source, res, resources)