actually working LIBPATH and CPPPATH options (renamed to APPEND_*)

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4965 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2007-03-02 20:33:43 +00:00
parent d2f099430b
commit b3947cabac

View file

@ -123,8 +123,8 @@ opts.Add(ListOption('SKIPDOC', 'A list of doc files that will not be built/insta
# build tools
opts.Add(BoolOption('MSTOOLKIT', 'Use Microsoft Visual C++ Toolkit', 'no'))
opts.Add(BoolOption('CHMDOCS', 'Build CHM documentation, requires hhc.exe', hhc))
opts.Add(PathOption('CPPPATH', 'Path to search for include files', None))
opts.Add(PathOption('LIBPATH', 'Path to search for libraries', None))
opts.Add(PathOption('APPEND_CPPPATH', 'Additional paths to search for include files', None))
opts.Add(PathOption('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'))
# build options
@ -300,6 +300,8 @@ if defenv['MSTOOLKIT']:
defenv.Append(CCFLAGS = Split('$APPEND_CCFLAGS'))
defenv.Append(LINKFLAGS = Split('$APPEND_LINKFLAGS'))
defenv.Append(CPPPATH = Split('$APPEND_CPPPATH'))
defenv.Append(LIBPATH = Split('$APPEND_LIBPATH'))
defenv.Default('$BUILD_PREFIX')