From 301e051f35e5bed9967183daef50bc2de040b5f5 Mon Sep 17 00:00:00 2001 From: David Rose Date: Tue, 3 Apr 2007 23:20:32 +0000 Subject: [PATCH] remove command-line WIN32_LEAN_AND_MEAN --- dtool/pptempl/Global.msvc.pp | 2 +- dtool/pptempl/compilerSettings.pp | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dtool/pptempl/Global.msvc.pp b/dtool/pptempl/Global.msvc.pp index c5179b896a..9d78572e73 100644 --- a/dtool/pptempl/Global.msvc.pp +++ b/dtool/pptempl/Global.msvc.pp @@ -124,7 +124,7 @@ #define obj_prefix // Additional global defines for building under Microsoft Visual Studio .NET. -#define extra_defines FORCE_INLINING HAVE_DINKUM WIN32_VC WIN32 WIN32_LEAN_AND_MEAN +#define extra_defines FORCE_INLINING HAVE_DINKUM WIN32_VC WIN32 // Additional compiler flags. #defer extra_cflags /EHsc /Zm500 $[WARNING_LEVEL_FLAG] $[END_CFLAGS] diff --git a/dtool/pptempl/compilerSettings.pp b/dtool/pptempl/compilerSettings.pp index 774bcc309b..8197dbee00 100644 --- a/dtool/pptempl/compilerSettings.pp +++ b/dtool/pptempl/compilerSettings.pp @@ -225,9 +225,6 @@ #define END_CFLAGS $[END_CFLAGS] /E #endif -// Let's just define this LEAN_AND_MEAN thing globally. -#define EXTRA_CDEFS WIN32_LEAN_AND_MEAN $[EXTRA_CDEFS] - #defer tau_opts $[decygwin %,-I"%",$[EXTRA_INCPATH] $[ipath] $[WIN32_PLATFORMSDK_INCPATH] $[tau_ipath]] $[building_var:%=-D%] #defer TAU_MAKE_IL $[PDT_ROOT]/Windows/bin/edgcpfe -o $[il_source] $[tau_opts] $[cdefines:%=-D%] $[C++FLAGS] -DWIN32=1 $[TAU_INSTRUMENTOR_FLAGS] $[source] #defer TAU_MAKE_PDB $[PDT_ROOT]/Windows/bin/taucpdisp $[il_source] > $[pdb_source]