Browse Source

remove old PCH stuff

David Rose 23 years ago
parent
commit
5de192e871
2 changed files with 0 additions and 47 deletions
  1. 0 32
      dtool/pptempl/Global.gmsvc.pp
  2. 0 15
      dtool/pptempl/Global.msvc.pp

+ 0 - 32
dtool/pptempl/Global.gmsvc.pp

@@ -6,12 +6,6 @@
 // Template.gmsvc.pp.
 // Template.gmsvc.pp.
 //
 //
 
 
-#define REQUIRED_PPREMAKE_VERSION 1.02
-
-#if $[< $[PPREMAKE_VERSION],$[REQUIRED_PPREMAKE_VERSION]]
-  #error You need at least ppremake version $[REQUIRED_PPREMAKE_VERSION] to use BUILD_TYPE gmsvc.
-#endif
-
 #defun get_metalibs target,complete_libs
 #defun get_metalibs target,complete_libs
   // In Windows, we need to know the complete set of metalibs that
   // In Windows, we need to know the complete set of metalibs that
   // encapsulates each of the libraries we'd be linking with normally.
   // encapsulates each of the libraries we'd be linking with normally.
@@ -57,12 +51,6 @@
 #define BROWSEINFO_FLAG
 #define BROWSEINFO_FLAG
 #endif
 #endif
 
 
-#if $[eq $[NO_PCH],]
-#define DO_PCH 1
-#else
-#define EXTRA_CDEFS NO_PCH $[EXTRA_CDEFS]
-#endif
-
 #define CFLAGS_SHARED
 #define CFLAGS_SHARED
 
 
 // Define LINK_ALL_STATIC to generate static libs instead of DLL's.
 // Define LINK_ALL_STATIC to generate static libs instead of DLL's.
@@ -80,26 +68,6 @@
 
 
 #include $[THISDIRPREFIX]compilerSettings.pp
 #include $[THISDIRPREFIX]compilerSettings.pp
 
 
-// multi-proc PCH /Z7 workaround conflicts with our need to have pdb at Opt3/4 with no increase in file size,
-// so commenting this out and removing all pch for now
-
-//#if $[and $[DO_PCH],$[>= $[NUMBER_OF_PROCESSORS],2]]
-// multi-processor PCH cannot use .pdb debug fmt because
-// .pdb file name must be the same for obj and pch header obj
-// and currently every cxx generates its own separate pdb
-// to avoid write file conflict in multi-proc build
-// multi-proc case
-// single-processor case will act like nmake, conditionally renaming .pdb each file in Template.gmsvc.pp
-// Note: need to do /Z7 for /Zi subst to support precomp pch headers on multi-proc build
-//#defer DEBUGFLAGS $[patsubst /Fd%,,$[subst /Zi,/Z7, $[DEBUGFLAGS]]]
-//#define NO_PDB 1
-//#else
-//
-// on multi-proc, since /Z7 opt required by precomp hdrs on multi-proc puts debug info into dlls,
-// dont want to force debug flag by default since it expands dll size
-//#define FORCE_DEBUG_FLAGS 1
-//#endif
-
 #if $[TEST_INLINING]
 #if $[TEST_INLINING]
 // /W4 will make MSVC spit out if it inlined a fn or not, but also cause a lot of other spam warnings
 // /W4 will make MSVC spit out if it inlined a fn or not, but also cause a lot of other spam warnings
 #define WARNING_LEVEL_FLAG /W4
 #define WARNING_LEVEL_FLAG /W4

+ 0 - 15
dtool/pptempl/Global.msvc.pp

@@ -76,14 +76,6 @@
   #define dlllib dll
   #define dlllib dll
 #endif
 #endif
 
 
-// NO_PCH is just a user override, if it is false, 
-// we still only do pch on dirs that request it
-#if $[eq $[NO_PCH],]
-#define DO_PCH 1
-#else
-#define EXTRA_CDEFS NO_PCH $[EXTRA_CDEFS]
-#endif
-
 #define CFLAGS_SHARED
 #define CFLAGS_SHARED
 
 
 #include $[THISDIRPREFIX]compilerSettings.pp
 #include $[THISDIRPREFIX]compilerSettings.pp
@@ -137,13 +129,6 @@
 #defer COMPILE_C $[COMPILER] /Fo"$[osfilename $[target]]" $[MAIN_C_COMPILE_ARGS]
 #defer COMPILE_C $[COMPILER] /Fo"$[osfilename $[target]]" $[MAIN_C_COMPILE_ARGS]
 #defer COMPILE_C++ $[COMPILE_C]
 #defer COMPILE_C++ $[COMPILE_C]
 
 
-#if $[DO_PCH]
-#defer MAIN_C_COMPILE_ARGS_PCH /Fp"$[osfilename $[target_pch]]" $[MAIN_C_COMPILE_ARGS]
-#defer COMPILE_C_WITH_PCH $[COMPILER] /Yu /Fo"$[osfilename $[target]]" $[MAIN_C_COMPILE_ARGS_PCH]
-#defer COMPILE_CSTYLE_PCH $[COMPILER] /TC /Yc /Fo"$[osfilename $[target_obj]]" $[MAIN_C_COMPILE_ARGS_PCH]
-#defer COMPILE_CXXSTYLE_PCH $[COMPILER] /TP /Yc /Fo"$[osfilename $[target_obj]]" $[MAIN_C_COMPILE_ARGS_PCH]
-#endif
-
 #defer STATIC_LIB_C $[LIBBER] /nologo $[sources] /OUT:"$[osfilename $[target]]" 
 #defer STATIC_LIB_C $[LIBBER] /nologo $[sources] /OUT:"$[osfilename $[target]]" 
 #defer STATIC_LIB_C++ $[STATIC_LIB_C]
 #defer STATIC_LIB_C++ $[STATIC_LIB_C]