Browse Source

nodefaultlib:libci.lib suggested by jason pratt

David Rose 21 years ago
parent
commit
2d6d9eac69
1 changed files with 9 additions and 0 deletions
  1. 9 0
      dtool/pptempl/compilerSettings.pp

+ 9 - 0
dtool/pptempl/compilerSettings.pp

@@ -33,6 +33,9 @@
   // Note: all Opts will link w/debug info now
   // Note: all Opts will link w/debug info now
   #define LINKER_FLAGS /DEBUG /DEBUGTYPE:CV $[PROFILE_FLAG] /MAP $[MAPINFOFLAGS] /fixed:no /incremental:no /WARN:3
   #define LINKER_FLAGS /DEBUG /DEBUGTYPE:CV $[PROFILE_FLAG] /MAP $[MAPINFOFLAGS] /fixed:no /incremental:no /WARN:3
 
 
+  // Added to avoid old iostream reference problems
+  #define LINKER_FLAGS $[LINKER_FLAGS] /NODEFAULTLIB:LIBCI.LIB
+
 // for mixed intel/msvc build, add these
 // for mixed intel/msvc build, add these
 //  #define EXTRA_LIBPATH /ia32/lib
 //  #define EXTRA_LIBPATH /ia32/lib
 //  #define EXTRA_INCPATH /ia32/include
 //  #define EXTRA_INCPATH /ia32/include
@@ -123,6 +126,9 @@
   // Note: all Opts will link w/debug info now
   // Note: all Opts will link w/debug info now
   #define LINKER_FLAGS /DEBUG $[PROFILE_FLAG] /MAP $[MAPINFOFLAGS] /fixed:no /incremental:no
   #define LINKER_FLAGS /DEBUG $[PROFILE_FLAG] /MAP $[MAPINFOFLAGS] /fixed:no /incremental:no
 
 
+  // Added to avoid old iostream reference problems
+  #define LINKER_FLAGS $[LINKER_FLAGS] /NODEFAULTLIB:LIBCI.LIB
+
 // in case we have mixed intel/msvc build
 // in case we have mixed intel/msvc build
 //  #define EXTRA_LIBPATH /ia32/lib
 //  #define EXTRA_LIBPATH /ia32/lib
 //  #define EXTRA_INCPATH /ia32/include
 //  #define EXTRA_INCPATH /ia32/include
@@ -172,6 +178,9 @@
   // Note: all Opts will link w/debug info now
   // Note: all Opts will link w/debug info now
   #define LINKER_FLAGS /DEBUG /DEBUGTYPE:CV $[PROFILE_FLAG] /MAP $[MAPINFOFLAGS] /fixed:no /incremental:no
   #define LINKER_FLAGS /DEBUG /DEBUGTYPE:CV $[PROFILE_FLAG] /MAP $[MAPINFOFLAGS] /fixed:no /incremental:no
 
 
+  // Added to avoid old iostream reference problems
+  #define LINKER_FLAGS $[LINKER_FLAGS] /NODEFAULTLIB:LIBCI.LIB
+
   // ensure pdbs are copied to install dir
   // ensure pdbs are copied to install dir
   #define build_pdbs yes
   #define build_pdbs yes