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

support specifying WXWIN on command line

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6002 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2009-11-29 23:19:58 +00:00
parent c076d135e7
commit 45da025cd8
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Contrib/NSIS Menu/SConscript
View file

@ -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)