diff --git a/dtool/pptempl/Global.gmsvc.pp b/dtool/pptempl/Global.gmsvc.pp index 9ce4e4d172..1008d3d417 100644 --- a/dtool/pptempl/Global.gmsvc.pp +++ b/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] diff --git a/dtool/pptempl/Global.msvc.pp b/dtool/pptempl/Global.msvc.pp index cc843cee92..690f517761 100644 --- a/dtool/pptempl/Global.msvc.pp +++ b/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]