From 45da025cd8e6be892b8b6a6646dda7d685aeb247 Mon Sep 17 00:00:00 2001 From: kichik Date: Sun, 29 Nov 2009 23:19:58 +0000 Subject: [PATCH] support specifying WXWIN on command line git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6002 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/NSIS Menu/SConscript | 8 ++++---- SConstruct | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Contrib/NSIS Menu/SConscript b/Contrib/NSIS Menu/SConscript index 73f03c28..74f36269 100644 --- a/Contrib/NSIS Menu/SConscript +++ b/Contrib/NSIS Menu/SConscript @@ -38,7 +38,7 @@ import os from os.path import join if env['PLATFORM'] != 'win32' and WhereIs('wx-config') or \ - env['PLATFORM'] == 'win32' and os.environ.has_key('WXWIN'): + env['PLATFORM'] == 'win32' and env.get('WXWIN'): # build @@ -66,10 +66,10 @@ if env['PLATFORM'] != 'win32' and WhereIs('wx-config') or \ # set directories if nsis_menu[0].env['PLATFORM'] == 'win32': - wxlib = [join(os.environ['WXWIN'], 'lib', 'vc_libnsis')] + wxlib = [join(env['WXWIN'], 'lib', 'vc_libnsis')] wxinc = [ - join(os.environ['WXWIN'], 'include'), - join(os.environ['WXWIN'], 'lib', 'vc_libnsis', 'msw') + join(env['WXWIN'], 'include'), + join(env['WXWIN'], 'lib', 'vc_libnsis', 'msw') ] nsis_menu[0].env.Append(LIBPATH = wxlib) nsis_menu[0].env.Append(CPPPATH = wxinc) diff --git a/SConstruct b/SConstruct index 75622bce..80872bc0 100644 --- a/SConstruct +++ b/SConstruct @@ -155,6 +155,7 @@ opts.Add(PathVariable('APPEND_CPPPATH', 'Additional paths to search for include opts.Add(PathVariable('APPEND_LIBPATH', 'Additional paths to search for libraries', None)) opts.Add(('APPEND_CCFLAGS', 'Additional C/C++ compiler flags')) opts.Add(('APPEND_LINKFLAGS', 'Additional linker flags')) +opts.Add(PathVariable('WXWIN', 'Path to wxWindows library folder (e.g. C:\\Dev\\wxWidgets-2.8.10)', os.environ.get('WXWIN'))) # build options opts.Add(BoolVariable('DEBUG', 'Build executables with debugging information', 'no')) opts.Add(PathVariable('CODESIGNER', 'A program used to sign executables', None))