From 6d71b946e32124d9586e96e133e83503645187be Mon Sep 17 00:00:00 2001
From: kichik <kichik@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Sun, 11 Nov 2012 04:33:52 +0000
Subject: [PATCH] tdefenv must be defined after defenv is ready 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
---
 SCons/Config/ms | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/SCons/Config/ms b/SCons/Config/ms
index 37aba2ce..f751554b 100644
--- a/SCons/Config/ms
+++ b/SCons/Config/ms
@@ -52,11 +52,6 @@ if defenv['DEBUG']:
 	defenv.Append(CCFLAGS = ['/Fd${TARGET.dir}\\${TARGET.dir.file}.pdb'])
 	defenv.Append(LINKFLAGS = ['/debug'])
 
-### unicode
-tdefenv = defenv.Clone()
-if tdefenv['UNICODE']:
-	tdefenv.Append(CPPDEFINES = ['_UNICODE', 'UNICODE'])
-
 ### workarounds
 
 # 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()
 
+### unicode
+tdefenv = defenv.Clone()
+if tdefenv['UNICODE']:
+	tdefenv.Append(CPPDEFINES = ['_UNICODE', 'UNICODE'])
 
 ### stub environment