From 59bdbf2614f94c25041ebbfcd12eda6d261782b1 Mon Sep 17 00:00:00 2001 From: kichik Date: Sun, 5 Oct 2014 21:04:19 +0000 Subject: [PATCH] fix gcc build git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6543 212acab6-be3b-0410-9dea-997c60f758d6 --- SCons/Config/ms | 1 + Source/SConscript | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/SCons/Config/ms b/SCons/Config/ms index 511431c1..11346419 100644 --- a/SCons/Config/ms +++ b/SCons/Config/ms @@ -143,6 +143,7 @@ makensis_env.Append(CCFLAGS = ['/Fa${TARGET}.lst']) # listing file name makensis_env.Append(CCFLAGS = [defenv['MSVCRT_FLAG']]) makensis_env.Append(LINKFLAGS = ['$MAP_FLAG']) # generate map file +makensis_env.Append(LINKFLAGS = ['$SUBSYS_CON']) # console executable if defenv['UNICODE']: makensis_env.Append(LINKFLAGS = ['/STACK:2097152']) # need 2 MB of stack in Unicode (default is 1 MB) diff --git a/Source/SConscript b/Source/SConscript index b3734390..3f9af5b0 100644 --- a/Source/SConscript +++ b/Source/SConscript @@ -73,10 +73,6 @@ AddZLib(env, env['PLATFORM'], 'install-compiler') env.Append(CPPDEFINES = ['MAKENSIS']) env.Append(CPPDEFINES = ['_WIN32_IE=0x0500']) -##### Gnereal settings - -env.Append(LINKFLAGS = ['$SUBSYS_CON']) - ##### Set PCH # XXX doesn't work