From 2d6d9eac695c5abadd3e0d747a0128509726e56a Mon Sep 17 00:00:00 2001 From: David Rose Date: Tue, 6 Jul 2004 20:26:20 +0000 Subject: [PATCH] nodefaultlib:libci.lib suggested by jason pratt --- dtool/pptempl/compilerSettings.pp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dtool/pptempl/compilerSettings.pp b/dtool/pptempl/compilerSettings.pp index c8d607197b..4c6a0e3a7b 100644 --- a/dtool/pptempl/compilerSettings.pp +++ b/dtool/pptempl/compilerSettings.pp @@ -33,6 +33,9 @@ // 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 + // Added to avoid old iostream reference problems + #define LINKER_FLAGS $[LINKER_FLAGS] /NODEFAULTLIB:LIBCI.LIB + // for mixed intel/msvc build, add these // #define EXTRA_LIBPATH /ia32/lib // #define EXTRA_INCPATH /ia32/include @@ -123,6 +126,9 @@ // Note: all Opts will link w/debug info now #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 // #define EXTRA_LIBPATH /ia32/lib // #define EXTRA_INCPATH /ia32/include @@ -172,6 +178,9 @@ // Note: all Opts will link w/debug info now #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 #define build_pdbs yes