moved _WIN32_IE definition to SConscript to avoid #include order problems
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4269 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
bb87348150
commit
0536d2a029
3 changed files with 2 additions and 3 deletions
|
@ -6,9 +6,6 @@
|
||||||
// includes
|
// includes
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
# ifndef _WIN32_IE
|
|
||||||
# define _WIN32_IE 0x0500
|
|
||||||
# endif
|
|
||||||
# include <windows.h>
|
# include <windows.h>
|
||||||
# include <commctrl.h>
|
# include <commctrl.h>
|
||||||
#else
|
#else
|
||||||
|
|
|
@ -67,6 +67,7 @@ conf.Finish()
|
||||||
|
|
||||||
##### Configuration defines
|
##### Configuration defines
|
||||||
|
|
||||||
|
env.Append(CPPDEFINES = ['_WIN32_IE=0x0500'])
|
||||||
env.Append(CPPDEFINES = env['NSIS_CPPDEFINES'])
|
env.Append(CPPDEFINES = env['NSIS_CPPDEFINES'])
|
||||||
|
|
||||||
##### Set PCH
|
##### Set PCH
|
||||||
|
|
|
@ -73,6 +73,7 @@ conf.Finish()
|
||||||
|
|
||||||
env.Append(CPPDEFINES = ['EXEHEAD'])
|
env.Append(CPPDEFINES = ['EXEHEAD'])
|
||||||
env.Append(CPPDEFINES = ['WIN32_LEAN_AND_MEAN'])
|
env.Append(CPPDEFINES = ['WIN32_LEAN_AND_MEAN'])
|
||||||
|
env.Append(CPPDEFINES = ['_WIN32_IE=0x0500'])
|
||||||
env.Append(CPPDEFINES = env['NSIS_CPPDEFINES'])
|
env.Append(CPPDEFINES = env['NSIS_CPPDEFINES'])
|
||||||
|
|
||||||
### Compression specific configuration
|
### Compression specific configuration
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue