Browse Source

add no-pch toggle

cxgeorge 24 years ago
parent
commit
2a71e1f403
2 changed files with 8 additions and 4 deletions
  1. 4 2
      dtool/pptempl/Global.gmsvc.pp
  2. 4 2
      dtool/pptempl/Global.msvc.pp

+ 4 - 2
dtool/pptempl/Global.gmsvc.pp

@@ -63,6 +63,8 @@
 
 #if $[eq $[NO_PCH],]
 #define DO_PCH 1
+#else
+#define EXTRA_CDEFS NO_PCH
 #endif
 
 #define CFLAGS_SHARED
@@ -99,9 +101,9 @@
 #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
 #define WARNING_LEVEL_FLAG /W4
-#define EXTRA_CDEFS $[EXTRA_CDEFS] FORCE_INLINING
+#define EXTRA_CDEFS $[EXTRA_CDEFS] FORCE_INLINING $[EXTRA_CDEFS]
 #elif $[or $[ne $[FORCE_INLINING],],$[>= $[OPTIMIZE],2]]
-#define EXTRA_CDEFS $[EXTRA_CDEFS] FORCE_INLINING
+#define EXTRA_CDEFS $[EXTRA_CDEFS] FORCE_INLINING $[EXTRA_CDEFS]
 #endif
 
 #defer CDEFINES_OPT1 _DEBUG $[dlink_all_static] $[EXTRA_CDEFS]

+ 4 - 2
dtool/pptempl/Global.msvc.pp

@@ -78,6 +78,8 @@
 // we still only do pch on dirs that request it
 #if $[eq $[NO_PCH],]
 #define DO_PCH 1
+#else
+#define EXTRA_CDEFS NO_PCH
 #endif
 
 #define CFLAGS_SHARED
@@ -89,9 +91,9 @@
 #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
 #define WARNING_LEVEL_FLAG /W4
-#define EXTRA_CDEFS $[EXTRA_CDEFS] FORCE_INLINING
+#define EXTRA_CDEFS $[EXTRA_CDEFS] FORCE_INLINING $[EXTRA_CDEFS]
 #elif $[or $[ne $[FORCE_INLINING],],$[>= $[OPTIMIZE],2]]
-#define EXTRA_CDEFS $[EXTRA_CDEFS] FORCE_INLINING
+#define EXTRA_CDEFS $[EXTRA_CDEFS] FORCE_INLINING $[EXTRA_CDEFS]
 #endif
 
 #defer CDEFINES_OPT1 _DEBUG $[dlink_all_static] $[EXTRA_CDEFS]