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

partially fixed bug #1672315: NSIS Menu not portable to Linux wxGTK

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4983 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
pabs3 2007-03-08 01:47:14 +00:00
parent 140845e1bb
commit 4580795d2f
3 changed files with 25 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Contrib/NSIS Menu/SConscript
View file

@ -46,16 +46,12 @@ Import('BuildUtil env')
import os
from os.path import join
if os.environ.has_key('WXWIN'):
# directories
wxlib = [join(os.environ['WXWIN'], 'lib', 'vc_libnsis')]
wxinc = [
join(os.environ['WXWIN'], 'include'),
join(os.environ['WXWIN'], 'lib', 'vc_libnsis', 'msw')
]
if env['PLATFORM'] != 'win32' or os.environ.has_key('WXWIN'):
# build
if env['PLATFORM'] != 'win32':
rc = libs = []
nsis_menu = BuildUtil(
target,
@ -64,13 +60,22 @@ if os.environ.has_key('WXWIN'):
res = rc,
resources = resources,
flags = ['$MSVCRT_FLAG', '$EXCEPTION_FLAG'],
root_util = True
root_util = True,
cross_platform = True
)
# set directories
nsis_menu[0].env.Append(LIBPATH = wxlib)
nsis_menu[0].env.Append(CPPPATH = wxinc)
if nsis_menu[0].env['PLATFORM'] == 'win32':
wxlib = [join(os.environ['WXWIN'], 'lib', 'vc_libnsis')]
wxinc = [
join(os.environ['WXWIN'], 'include'),
join(os.environ['WXWIN'], 'lib', 'vc_libnsis', 'msw')
]
nsis_menu[0].env.Append(LIBPATH = wxlib)
nsis_menu[0].env.Append(CPPPATH = wxinc)
else:
nsis_menu[0].env.ParseConfig('wx-config --cxxflags --libs')
# install menu files