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

append nsis menu include/lib paths in the sconscript

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4964 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2007-03-02 11:36:18 +00:00
parent b293ebb229
commit d2f099430b
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Contrib/NSIS Menu/SConscript
View file

@ -57,18 +57,21 @@ if os.environ.has_key('WXWIN'):
# build # build
BuildUtil( nsis_menu = BuildUtil(
target, target,
files, files,
libs, libs,
res = rc, res = rc,
resources = resources, resources = resources,
flags = ['$MSVCRT_FLAG', '$EXCEPTION_FLAG'], flags = ['$MSVCRT_FLAG', '$EXCEPTION_FLAG'],
libpath = wxlib,
incpath = wxinc,
root_util = True root_util = True
) )
# set directories
nsis_menu[0].env.Append(LIBPATH = wxlib)
nsis_menu[0].env.Append(CPPPATH = wxinc)
# install menu files # install menu files
env.DistributeMenu(html, alias='install-utils') env.DistributeMenu(html, alias='install-utils')

5
SConstruct
View file

@ -503,15 +503,12 @@ def BuildUtil(target, source, libs, entry = None, res = None,
resources = None, defines = None, flags = None, resources = None, defines = None, flags = None,
nodeflib = False, file_name = '', path='', contrib = False, nodeflib = False, file_name = '', path='', contrib = False,
examples = None, docs = None, cross_platform = False, examples = None, docs = None, cross_platform = False,
root_util = False, libpath = [], incpath = []): root_util = False):
if not cross_platform: if not cross_platform:
env = util_env.Clone() env = util_env.Clone()
else: else:
env = cp_util_env.Clone() env = cp_util_env.Clone()
env.Append(CPPPATH = incpath)
env.Append(LIBPATH = libpath)
AddEnvStandardFlags(env, defines, flags, entry, nodeflib) AddEnvStandardFlags(env, defines, flags, entry, nodeflib)
AppendRES(env, source, res, resources) AppendRES(env, source, res, resources)