more path fixes

dtool/pptempl/Global.gmsvc.pp

@@ -115,8 +115,8 @@
  $[if $[ne $[DONT_USE_PANDA_DLL_NAMING],], $[dll_basename], lib$[dll_basename]$[dllext]]
 #end get_dllname
 
-#defer interrogate_ipath $[decygwin %,-I"%",$[target_ipath]]
-#defer interrogate_spath $[decygwin %,-S"%",$[install_parser_inc_dir]]
+#defer interrogate_ipath $[decygwin %,-I"%",$[install_parser_inc_dir]] $[decygwin %,-I"%",$[target_ipath]]
+#defer interrogate_spath 
 
 // '#defer extra_cflags $[extra_cflags] /STUFF' will never work because extra_cflags hasnt been
 // defined yet, so this just evaluates the reference to null and removes the reference and the

dtool/pptempl/Global.msvc.pp

@@ -129,8 +129,8 @@
 // Additional compiler flags.
 #defer extra_cflags /EHsc /Zm500 $[WARNING_LEVEL_FLAG] $[END_CFLAGS]
 
-#defer interrogate_ipath $[decygwin %,-I"%",$[target_ipath]]
-#defer interrogate_spath $[decygwin %,-S"%",$[install_parser_inc_dir]]
+#defer interrogate_ipath $[decygwin %,-I"%",$[install_parser_inc_dir]] $[decygwin %,-I"%",$[target_ipath]]
+#defer interrogate_spath 
 
 #defer DECYGWINED_INC_PATHLIST_ARGS $[decygwin %,/I"%",$[EXTRA_INCPATH] $[ipath] $[WIN32_PLATFORMSDK_INCPATH]]
 #defer MAIN_C_COMPILE_ARGS /nologo /c $[DECYGWINED_INC_PATHLIST_ARGS] $[flags] $[extra_cflags] "$[osfilename $[source]]"

dtool/pptempl/Global.nmake.pp

@@ -119,8 +119,8 @@
  $[if $[ne $[DONT_USE_PANDA_DLL_NAMING],], $[dll_basename], lib$[dll_basename]$[dllext]]
 #end get_dllname
 
-#defer interrogate_ipath $[decygwin %,-I"%",$[target_ipath]]
-#defer interrogate_spath $[decygwin %,-S"%",$[install_parser_inc_dir]]
+#defer interrogate_ipath $[decygwin %,-I"%",$[install_parser_inc_dir]] $[decygwin %,-I"%",$[target_ipath]]
+#defer interrogate_spath 
 
 // '#defer extra_cflags $[extra_cflags] /STUFF' will never work because extra_cflags hasnt been
 // defined yet, so this just evaluates the reference to null and removes the reference and the