Browse Source

optional force inlining flag

cxgeorge 25 years ago
parent
commit
ee1321a414
2 changed files with 16 additions and 6 deletions
  1. 8 3
      dtool/pptempl/Global.gmsvc.pp
  2. 8 3
      dtool/pptempl/Global.msvc.pp

+ 8 - 3
dtool/pptempl/Global.gmsvc.pp

@@ -119,10 +119,15 @@
 #defer interrogate_ipath $[decygwin %,-I"%",$[target_ipath]]
 #defer interrogate_ipath $[decygwin %,-I"%",$[target_ipath]]
 #defer interrogate_spath $[decygwin %,-S"%",$[install_parser_inc_dir]]
 #defer interrogate_spath $[decygwin %,-S"%",$[install_parser_inc_dir]]
 
 
-#if $[TEST_INLINING]
-#define WARNING_LEVEL_FLAG /W4 /DTEST_INLINING
-#else
 #define WARNING_LEVEL_FLAG /W3
 #define WARNING_LEVEL_FLAG /W3
+
+#if $[FORCE_INLINING]
+#define WARNING_LEVEL_FLAG /W3 /DFORCE_INLINING
+#endif
+
+#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 /DFORCE_INLINING
 #endif
 #endif
 
 
 #defer extra_cflags /EHsc /Zm250 /DWIN32_VC /DWIN32 $[WARNING_LEVEL_FLAG] $[END_CFLAGS]
 #defer extra_cflags /EHsc /Zm250 /DWIN32_VC /DWIN32 $[WARNING_LEVEL_FLAG] $[END_CFLAGS]

+ 8 - 3
dtool/pptempl/Global.msvc.pp

@@ -120,10 +120,15 @@
 #defer interrogate_ipath $[decygwin %,-I"%",$[target_ipath]]
 #defer interrogate_ipath $[decygwin %,-I"%",$[target_ipath]]
 #defer interrogate_spath $[decygwin %,-S"%",$[install_parser_inc_dir]]
 #defer interrogate_spath $[decygwin %,-S"%",$[install_parser_inc_dir]]
 
 
-#if $[TEST_INLINING]
-#define WARNING_LEVEL_FLAG /W4 /DTEST_INLINING
-#else
 #define WARNING_LEVEL_FLAG /W3
 #define WARNING_LEVEL_FLAG /W3
+
+#if $[FORCE_INLINING]
+#define WARNING_LEVEL_FLAG /W3 /DFORCE_INLINING
+#endif
+
+#if $[TEST_INLINING]
+// /W4 will make MSVC spit out if it inlined a fn or not
+#define WARNING_LEVEL_FLAG /W4 /DFORCE_INLINING
 #endif
 #endif
 
 
 #defer extra_cflags /EHsc /Zm250 /DWIN32_VC /DWIN32 $[WARNING_LEVEL_FLAG] $[END_CFLAGS]
 #defer extra_cflags /EHsc /Zm250 /DWIN32_VC /DWIN32 $[WARNING_LEVEL_FLAG] $[END_CFLAGS]