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

tdefenv must be defined after defenv is ready

Browse source 
this caused tdefenv (and therefore util_env) not to contain the right pointers to libcp.lib

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6282 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2012-11-11 04:33:52 +00:00
parent 3076227025
commit 6d71b946e3
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
SCons/Config/ms
View file

@ -52,11 +52,6 @@ if defenv['DEBUG']:
defenv.Append(CCFLAGS = ['/Fd${TARGET.dir}\\${TARGET.dir.file}.pdb']) defenv.Append(CCFLAGS = ['/Fd${TARGET.dir}\\${TARGET.dir.file}.pdb'])
defenv.Append(LINKFLAGS = ['/debug']) defenv.Append(LINKFLAGS = ['/debug'])
### unicode
tdefenv = defenv.Clone()
if tdefenv['UNICODE']:
tdefenv.Append(CPPDEFINES = ['_UNICODE', 'UNICODE'])
### workarounds ### workarounds
# Some Platform SDK version includes a bad version of libcp.lib. # Some Platform SDK version includes a bad version of libcp.lib.
@ -102,6 +97,10 @@ if float(defenv['MSVS_VERSION'].replace('Exp','')) < 8.0:
conf.Finish() conf.Finish()
### unicode
tdefenv = defenv.Clone()
if tdefenv['UNICODE']:
tdefenv.Append(CPPDEFINES = ['_UNICODE', 'UNICODE'])
### stub environment ### stub environment