Browse Source

remove command-line WIN32_LEAN_AND_MEAN

David Rose 18 years ago
parent
commit
301e051f35
2 changed files with 1 additions and 4 deletions
  1. 1 1
      dtool/pptempl/Global.msvc.pp
  2. 0 3
      dtool/pptempl/compilerSettings.pp

+ 1 - 1
dtool/pptempl/Global.msvc.pp

@@ -124,7 +124,7 @@
 #define obj_prefix
 #define obj_prefix
 
 
 // Additional global defines for building under Microsoft Visual Studio .NET.
 // 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.
 // Additional compiler flags.
 #defer extra_cflags /EHsc /Zm500 $[WARNING_LEVEL_FLAG] $[END_CFLAGS]
 #defer extra_cflags /EHsc /Zm500 $[WARNING_LEVEL_FLAG] $[END_CFLAGS]

+ 0 - 3
dtool/pptempl/compilerSettings.pp

@@ -225,9 +225,6 @@
 #define END_CFLAGS $[END_CFLAGS] /E
 #define END_CFLAGS $[END_CFLAGS] /E
 #endif
 #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_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_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]
 #defer TAU_MAKE_PDB $[PDT_ROOT]/Windows/bin/taucpdisp $[il_source] > $[pdb_source]