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

detect wx-config before trying to run it (part of bug #1672315)

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5028 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2007-04-01 18:00:19 +00:00
parent 82d6166fdf
commit 0a7a11111f
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Contrib/NSIS Menu/SConscript
View file

@ -46,10 +46,11 @@ Import('BuildUtil env')
import os import os
from os.path import join from os.path import join
if env['PLATFORM'] != 'win32' or os.environ.has_key('WXWIN'): if env['PLATFORM'] != 'win32' and WhereIs('wx-config') or \
env['PLATFORM'] == 'win32' and os.environ.has_key('WXWIN'):
# build # build
if env['PLATFORM'] != 'win32': if env['PLATFORM'] != 'win32':
rc = libs = [] rc = libs = []
@ -93,7 +94,10 @@ else:
# no wxWidgets # no wxWidgets
def err(target, source, env): def err(target, source, env):
print '*** error: WXWIN must be set to build NSIS Menu!' if env['PLATFORM'] == 'win32':
print '*** error: WXWIN must be set to build NSIS Menu!'
else:
print '*** error: wx-config must be in the PATH to build NSIS Menu!'
return 1 return 1
cmd = env.Command(target, files, Action(err, '')) cmd = env.Command(target, files, Action(err, ''))