fix to mixed build types

dtool/pptempl/Global.gmsvc.pp

@@ -75,47 +75,7 @@
   #define dlllib dll
 #endif
 
-#if $[and $[eq $[USE_COMPILER], INTEL], $[eq $[NOT_INTEL_BUILDABLE], true]]
-#define USE_COMPILER MSVC
-#endif
-
-#if $[eq $[USE_COMPILER], MSVC]
-  #define COMPILER cl
-  #define LINKER link
-  #define LIBBER lib
-  #define COMMONFLAGS /Gi-
-  #define OPTFLAGS /O2 /Ob1 /G6
-  #defer DEBUGFLAGS /MDd /Zi $[BROWSEINFO_FLAG] /Fd"$[osfilename $[target:%.obj=%.pdb]]"
-  #define RELEASEFLAGS /MD
-  
-// in case we have mixed intel/msvc build
-  #define EXTRA_LIBPATH /ia32/lib
-  #define EXTRA_INCPATH /ia32/include    
-#elif $[eq $[USE_COMPILER], BOUNDS]
-  #define COMPILER nmcl
-  #define LINKER nmlink
-  #define LIBBER lib
-  #define COMMONFLAGS
-  #define OPTFLAGS /O2 /Ogity /G6
-  #defer DEBUGFLAGS /MDd /Zi $[BROWSEINFO_FLAG] /Fd"$[osfilename $[target:%.obj=%.pdb]]"
-  #define RELEASEFLAGS /MD
-  #define EXTRA_LIBPATH
-  #define EXTRA_INCPATH
-#elif $[eq $[USE_COMPILER], INTEL]
-  #define COMPILER icl
-  #define LINKER xilink
-  #define LIBBER xilib
-  #define COMMONFLAGS /Gi- /Qwd985
-//  #define OPTFLAGS /O3 /G6 /Qvc6 /Qipo /QaxW /Qvec_report1 
-  #define OPTFLAGS /O3 /G6 /Qvc6 /Qip
-  #define DEBUGFLAGS /MDd /Zi /Qinline_debug_info
-  #define RELEASEFLAGS /MD
-  // We assume the Intel compiler installation dir is mounted as /ia32.
-  #define EXTRA_LIBPATH /ia32/lib
-  #define EXTRA_INCPATH /ia32/include  
-#else
-  #error Invalid value specified for USE_COMPILER.
-#endif
+#include $[DTOOL]/pptempl/compilerSettings.pp
 
 #if $[CHECK_SYNTAX_ONLY]
 #define END_CFLAGS $[END_CFLAGS] /Zs 

dtool/pptempl/Global.msvc.pp

@@ -76,45 +76,7 @@
 
 #define CFLAGS_SHARED
 
-#if $[and $[eq $[USE_COMPILER], INTEL], $[eq $[NOT_INTEL_BUILDABLE], true]]
-#define USE_COMPILER MSVC
-#endif
-
-#if $[eq $[USE_COMPILER], MSVC]
-  #define COMPILER cl
-  #define LINKER link
-  #define LIBBER lib
-  #define COMMONFLAGS /Gi-
-  #define OPTFLAGS /O2 /Ob1 /G6
-  #defer  DEBUGFLAGS /MDd /Zi $[BROWSEINFO_FLAG] /Fd"$[osfilename $[target:%.obj=%.pdb]]"
-  #define RELEASEFLAGS /MD
-  #define EXTRA_LIBPATH
-  #define EXTRA_INCPATH  
-#elif $[eq $[USE_COMPILER], BOUNDS]
-  #define COMPILER nmcl
-  #define LINKER nmlink
-  #define LIBBER lib
-  #define COMMONFLAGS
-  #define OPTFLAGS /O2 /G6
-  #defer  DEBUGFLAGS /MDd /Zi $[BROWSEINFO_FLAG] /Fd"$[osfilename $[target:%.obj=%.pdb]]"
-  #define RELEASEFLAGS /MD
-  #define EXTRA_LIBPATH
-  #define EXTRA_INCPATH
-#elif $[eq $[USE_COMPILER], INTEL]
-  #define COMPILER icl
-  #define LINKER xilink
-  #define LIBBER xilib
-  #define COMMONFLAGS /Gi-
-//  #define OPTFLAGS  /O3 /G6 /Qvc6 /Qwd985 /Qipo /QaxW /Qvec_report1
-  #define OPTFLAGS  /O3 /G6 /Qvc6 /Qwd985
-  #define DEBUGFLAGS /MDd /Zi $[BROWSEINFO_FLAG]
-  #define RELEASEFLAGS /MD
-  // We assume the Intel compiler installation dir is mounted as /ia32.
-  #define EXTRA_LIBPATH /ia32/lib
-  #define EXTRA_INCPATH /ia32/include
-#else
-  #error Invalid value specified for USE_COMPILER.
-#endif
+#include $[DTOOL]/pptempl/compilerSettings.pp
 
 #if $[CHECK_SYNTAX_ONLY]
 #define END_CFLAGS $[END_CFLAGS] /Zs 

dtool/pptempl/compilerSettings.pp

@@ -0,0 +1,39 @@
+
+#if $[eq $[USE_COMPILER], MSVC]
+  #define COMPILER cl
+  #define LINKER link
+  #define LIBBER lib
+  #define COMMONFLAGS /Gi-
+  #define OPTFLAGS /O2 /Ob1 /G6
+  #defer DEBUGFLAGS /MDd /Zi $[BROWSEINFO_FLAG] /Fd"$[osfilename $[target:%.obj=%.pdb]]"
+  #define RELEASEFLAGS /MD
+  
+// in case we have mixed intel/msvc build
+  #define EXTRA_LIBPATH /ia32/lib
+  #define EXTRA_INCPATH /ia32/include    
+#elif $[eq $[USE_COMPILER], BOUNDS]
+  #define COMPILER nmcl
+  #define LINKER nmlink
+  #define LIBBER lib
+  #define COMMONFLAGS
+  #define OPTFLAGS /O2 /Ogity /G6
+  #defer DEBUGFLAGS /MDd /Zi $[BROWSEINFO_FLAG] /Fd"$[osfilename $[target:%.obj=%.pdb]]"
+  #define RELEASEFLAGS /MD
+  #define EXTRA_LIBPATH
+  #define EXTRA_INCPATH
+#elif $[eq $[USE_COMPILER], INTEL]
+  #define COMPILER icl
+  #define LINKER xilink
+  #define LIBBER xilib
+  #define COMMONFLAGS /Gi- /Qwd985
+//  #define OPTFLAGS /O3 /G6 /Qvc6 /Qipo /QaxW /Qvec_report1 
+  #define OPTFLAGS /O3 /G6 /Qvc6 /Qip
+  #define DEBUGFLAGS /MDd /Zi /Qinline_debug_info
+  #define RELEASEFLAGS /MD
+  // We assume the Intel compiler installation dir is mounted as /ia32.
+  #define EXTRA_LIBPATH /ia32/lib
+  #define EXTRA_INCPATH /ia32/include  
+#else
+  #error Invalid value specified for USE_COMPILER.
+#endif
+

panda/src/chancfg/Sources.pp

@@ -1,8 +1,10 @@
 #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \
                    dtoolutil:c dtoolbase:c dtool:m
 
-// need to modify global scope
-#set NOT_INTEL_BUILDABLE true
+#if $[eq $[USE_COMPILER], INTEL]
+#define USE_COMPILER MSVC
+#include $[DTOOL]/pptempl/compilerSettings.pp
+#endif
 
 #begin lib_target
   #define TARGET chancfg

panda/src/char/Sources.pp

@@ -1,8 +1,10 @@
 #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \
                    dtoolutil:c dtoolbase:c dtool:m
 				   
-// need to modify global scope
-#set NOT_INTEL_BUILDABLE true				   
+#if $[eq $[USE_COMPILER], INTEL]
+#define USE_COMPILER MSVC
+#include $[DTOOL]/pptempl/compilerSettings.pp
+#endif
 
 #begin lib_target
   #define TARGET char

panda/src/collide/Sources.pp

@@ -1,8 +1,10 @@
 #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \
                    dtoolutil:c dtoolbase:c dtool:m
-				   
-// need to modify global scope
-#set NOT_INTEL_BUILDABLE true				   
+
+#if $[eq $[USE_COMPILER], INTEL]
+#define USE_COMPILER MSVC
+#include $[DTOOL]/pptempl/compilerSettings.pp
+#endif
 
 #begin lib_target
   #define TARGET collide

panda/src/device/Sources.pp

@@ -1,8 +1,10 @@
 #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \
                    dtoolutil:c dtoolbase:c dtool:m
 				   
-// need to modify global scope
-#set NOT_INTEL_BUILDABLE true				   
+#if $[eq $[USE_COMPILER], INTEL]
+#define USE_COMPILER MSVC
+#include $[DTOOL]/pptempl/compilerSettings.pp
+#endif				   
 
 #begin lib_target
   #define TARGET device

panda/src/display/Sources.pp

@@ -1,8 +1,10 @@
 #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \
                    dtoolutil:c dtoolbase:c dtool:m
 				   
-// need to modify global scope
-#set NOT_INTEL_BUILDABLE true				   
+#if $[eq $[USE_COMPILER], INTEL]
+#define USE_COMPILER MSVC
+#include $[DTOOL]/pptempl/compilerSettings.pp
+#endif
 
 #begin lib_target
   #define TARGET display

panda/src/gui/Sources.pp

@@ -1,8 +1,8 @@
 #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \
                    dtoolutil:c dtoolbase:c dtool:m
 
-// need to modify global scope
-#set NOT_INTEL_BUILDABLE true
+#define NOT_INTEL_BUILDABLE true				   
+$[CheckCompilerCompatibility]
 
 #begin lib_target
   #define TARGET gui