From b01dc2af2e5ba3c69ba18b21fdffebf9245d09ed Mon Sep 17 00:00:00 2001 From: Chris Brunner Date: Tue, 25 Mar 2008 21:37:06 +0000 Subject: [PATCH] fixes for MSVC9 --- dtool/pptempl/compilerSettings.pp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dtool/pptempl/compilerSettings.pp b/dtool/pptempl/compilerSettings.pp index 3218937d3d..8dfe8fd555 100644 --- a/dtool/pptempl/compilerSettings.pp +++ b/dtool/pptempl/compilerSettings.pp @@ -122,8 +122,7 @@ // Added to avoid old iostream reference problems #define LINKER_FLAGS $[LINKER_FLAGS] /NODEFAULTLIB:LIBCI.LIB - // Added to make pandatool function in VS 8 - #if $[or $[eq $[USE_COMPILER],MSVC8], $[eq $[USE_COMPILER],MSVC9]] + #if $[eq $[USE_COMPILER],MSVC8] #define LINKER_FLAGS $[LINKER_FLAGS] /NOD:MFC80.LIB /NOD:libcmtd /NOD:libc #endif // #define LINKER_FLAGS $[LINKER_FLAGS] /NODEFAULTLIB:LIBCI.LIB /NODEFAULTLIB:msvcrt.lib /NODEFAULTLIB:msvcprt.lib @@ -209,10 +208,8 @@ // Added to avoid old iostream reference problems #define LINKER_FLAGS $[LINKER_FLAGS] /NODEFAULTLIB:LIBCI.LIB - // Added to make pandatool function in VS 8 - #if $[or $[eq $[USE_COMPILER],MSVC8], $[eq $[USE_COMPILER],MSVC9]] - #define LINKER_FLAGS $[LINKER_FLAGS] /NOD:MFC80.LIB /NOD:libcmtd /NOD:libc - #endif + // Added to make pandatool function in VS 9 + #define LINKER_FLAGS $[LINKER_FLAGS] /NOD:MFC90.LIB /NOD:libcmtd /NOD:libc // #define LINKER_FLAGS $[LINKER_FLAGS] /NODEFAULTLIB:LIBCI.LIB /NODEFAULTLIB:msvcrt.lib /NODEFAULTLIB:msvcprt.lib // in case we have mixed intel/msvc build