From ac083bb502fca52bfabcb74c2bda574948b5d2fd Mon Sep 17 00:00:00 2001
From: cxgeorge <>
Date: Tue, 6 Nov 2001 00:20:08 +0000
Subject: [PATCH] updates for msvc7

---
 dtool/pptempl/Global.gmsvc.pp     |  2 --
 dtool/pptempl/Global.msvc.pp      |  2 --
 dtool/pptempl/compilerSettings.pp | 41 ++++++++++++++++++++++++++++++-
 3 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/dtool/pptempl/Global.gmsvc.pp b/dtool/pptempl/Global.gmsvc.pp
index a931e73aad..7def179b8f 100644
--- a/dtool/pptempl/Global.gmsvc.pp
+++ b/dtool/pptempl/Global.gmsvc.pp
@@ -104,8 +104,6 @@
 //#define FORCE_DEBUG_FLAGS 1
 //#endif
 
-#define WARNING_LEVEL_FLAG /W3
-
 #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
diff --git a/dtool/pptempl/Global.msvc.pp b/dtool/pptempl/Global.msvc.pp
index 346774ebcd..70f910e0f5 100644
--- a/dtool/pptempl/Global.msvc.pp
+++ b/dtool/pptempl/Global.msvc.pp
@@ -88,8 +88,6 @@
 
 #include $[THISDIRPREFIX]compilerSettings.pp
 
-#define WARNING_LEVEL_FLAG /W3
-
 #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
diff --git a/dtool/pptempl/compilerSettings.pp b/dtool/pptempl/compilerSettings.pp
index 6b4cc600c4..92cefc409b 100644
--- a/dtool/pptempl/compilerSettings.pp
+++ b/dtool/pptempl/compilerSettings.pp
@@ -6,6 +6,7 @@
   #define COMMONFLAGS /Gi-
   #define OPTFLAGS /O2 /Ob1 /G6
   #define OPT1FLAGS /GZ 
+  #define WARNING_LEVEL_FLAG /W3  
 
   // Note: Zi cannot be used on multiproc builds with precomp hdrs, Z7 must be used instead
   #defer DEBUGPDBFLAGS /Zi /Fd"$[osfilename $[target:%.obj=%.pdb]]"  
@@ -26,7 +27,43 @@
   
 // in case we have mixed intel/msvc build
   #define EXTRA_LIBPATH /ia32/lib
-  #define EXTRA_INCPATH /ia32/include    
+  #define EXTRA_INCPATH /ia32/include
+  
+#elif $[eq $[USE_COMPILER], MSVC7]
+
+  #define COMPILER cl
+  #define LINKER link
+  #define LIBBER lib
+  
+  // this is too late it must be
+  #define UNKNOWN_ALLOCATOR 1  
+
+  #define COMMONFLAGS /DHAVE_DINKUM 
+  #define OPTFLAGS /O2 /Ob1 /G6
+  #define OPT1FLAGS /GZ /GS
+  
+//  #define WARNING_LEVEL_FLAG /Wall  //this is scary
+  #define WARNING_LEVEL_FLAG /W3   // WL
+
+  // Note: Zi cannot be used on multiproc builds with precomp hdrs, Z7 must be used instead
+  #defer DEBUGPDBFLAGS /Zi /Fd"$[osfilename $[target:%.obj=%.pdb]]"  
+  #defer DEBUGFLAGS /MDd $[BROWSEINFO_FLAG] $[DEBUGINFOFLAGS] $[DEBUGPDBFLAGS]
+  #define RELEASEFLAGS /MD
+  
+  #define MAPINFOFLAGS /MAPINFO:EXPORTS /MAPINFO:LINES
+  
+  #if $[ENABLE_PROFILING]
+    #define PROFILE_FLAG /FIXED:NO
+  #else
+    #define PROFILE_FLAG 
+  #endif
+ 
+  // Note: all Opts will link w/debug info now 
+  #define LINKER_FLAGS /DEBUG $[PROFILE_FLAG] /MAP $[MAPINFOFLAGS] /fixed:no /incremental:no 
+  
+// in case we have mixed intel/msvc build
+  #define EXTRA_LIBPATH /ia32/lib
+  #define EXTRA_INCPATH /ia32/include      
 #elif $[eq $[USE_COMPILER], BOUNDS] // NuMega BoundsChecker
   #define COMPILER nmcl
   #define LINKER nmlink
@@ -70,6 +107,8 @@
   #define DEBUGFLAGS /MDd /Zi /Qinline_debug_info /Oy-
   #define OPT1FLAGS /GZ /Od
   #define RELEASEFLAGS /MD
+  #define WARNING_LEVEL_FLAG /W3  
+
   // We assume the Intel compiler installation dir is mounted as /ia32.
   #define EXTRA_LIBPATH /ia32/lib
   #define EXTRA_INCPATH /ia32/include