fixed vs2012 builds

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6542 212acab6-be3b-0410-9dea-997c60f758d6

Docs/src/history.but

@@ -22,19 +22,21 @@ Released on ?, 2014
 
 \S2{} Minor Changes
 
+\b Added IsWow64 to x64.nsh
+
+\b Added PEDllCharacteristics attribute
+
 \b Added System::Call direct register memory access type. (\W{http://sf.net/p/nsis/patches/249}{patch #249})
 
 \b Added WX compiler switch
 
-\b Added PEDllCharacteristics attribute
-
 \b Changed default DllCharacteristics to TS_AWARE+NO_SEH+NX_COMPAT+DYNAMIC_BASE
 
 \b Fixed POSIX !searchparse bug (\W{http://sf.net/p/nsis/patches/251}{patch #251})
 
 \b Fixed !macroundef
 
-\b Added IsWow64 to x64.nsh
+\b Fixed Visual Studio 2012 builds
 
 \S2{} Translations
 

SCons/Config/ms

@@ -38,6 +38,10 @@ if msvs_version < 10.0:
 	defenv.Append(LINKFLAGS = ['/opt:nowin98'])
 if defenv['MSTOOLKIT'] and msvs_version < 8.0:
 	defenv['MSVCRT_FLAG'] = '/ML' # TK2003 does not have all libs
+if msvs_version >= 11.0:
+	defenv.Append(LINKFLAGS = ['/FIXED']) # no relocations that our resource editor ignores
+	defenv['SUBSYS_CON'] = '/subsystem:console,5.01' # support windows xp
+	defenv['SUBSYS_WIN'] = '/subsystem:windows,5.01' # support windows xp
 
 ### defines
 

Source/SConscript

@@ -73,6 +73,10 @@ AddZLib(env, env['PLATFORM'], 'install-compiler')
 env.Append(CPPDEFINES = ['MAKENSIS'])
 env.Append(CPPDEFINES = ['_WIN32_IE=0x0500'])
 
+##### Gnereal settings
+
+env.Append(LINKFLAGS = ['$SUBSYS_CON'])
+
 ##### Set PCH
 
 # XXX doesn't work