From 0536d2a0298fb8851e2f10b748f8f25a885631e6 Mon Sep 17 00:00:00 2001 From: kichik Date: Sat, 17 Sep 2005 08:33:00 +0000 Subject: [PATCH] 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 --- Source/Platform.h | 3 --- Source/SConscript | 1 + Source/exehead/SConscript | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Source/Platform.h b/Source/Platform.h index ea611863..791bdb5a 100644 --- a/Source/Platform.h +++ b/Source/Platform.h @@ -6,9 +6,6 @@ // includes #ifdef _WIN32 -# ifndef _WIN32_IE -# define _WIN32_IE 0x0500 -# endif # include # include #else diff --git a/Source/SConscript b/Source/SConscript index b88e330c..3706a4a0 100644 --- a/Source/SConscript +++ b/Source/SConscript @@ -67,6 +67,7 @@ conf.Finish() ##### Configuration defines +env.Append(CPPDEFINES = ['_WIN32_IE=0x0500']) env.Append(CPPDEFINES = env['NSIS_CPPDEFINES']) ##### Set PCH diff --git a/Source/exehead/SConscript b/Source/exehead/SConscript index dcf542dc..3146dfd5 100644 --- a/Source/exehead/SConscript +++ b/Source/exehead/SConscript @@ -73,6 +73,7 @@ conf.Finish() env.Append(CPPDEFINES = ['EXEHEAD']) env.Append(CPPDEFINES = ['WIN32_LEAN_AND_MEAN']) +env.Append(CPPDEFINES = ['_WIN32_IE=0x0500']) env.Append(CPPDEFINES = env['NSIS_CPPDEFINES']) ### Compression specific configuration