From 41ca275866c603784d8972d00197ced4336ddfbe Mon Sep 17 00:00:00 2001 From: shlainn Date: Sat, 3 Dec 2011 14:51:16 +0100 Subject: [PATCH] * Re-fix Windows Build after StormLib update --- src/dep/src/StormLib/src/StormLib.h | 66 ++++++++++++++--------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/src/dep/src/StormLib/src/StormLib.h b/src/dep/src/StormLib/src/StormLib.h index 759440a..df2d515 100644 --- a/src/dep/src/StormLib/src/StormLib.h +++ b/src/dep/src/StormLib/src/StormLib.h @@ -87,39 +87,39 @@ // Z - S for static-linked CRT library, D for multithreaded DLL CRT library // -#if defined(_MSC_VER) && !defined(__STORMLIB_SELF__) - - #ifdef _DEBUG // DEBUG VERSIONS - #ifndef _UNICODE - #ifdef _DLL - #pragma comment(lib, "StormLibDAD.lib") // Debug Ansi CRT-DLL version - #else - #pragma comment(lib, "StormLibDAS.lib") // Debug Ansi CRT-LIB version - #endif - #else - #ifdef _DLL - #pragma comment(lib, "StormLibDUD.lib") // Debug Unicode CRT-DLL version - #else - #pragma comment(lib, "StormLibDUS.lib") // Debug Unicode CRT-LIB version - #endif - #endif - #else // RELEASE VERSIONS - #ifndef _UNICODE - #ifdef _DLL - #pragma comment(lib, "StormLibRAD.lib") // Release Ansi CRT-DLL version - #else - #pragma comment(lib, "StormLibRAS.lib") // Release Ansi CRT-LIB version - #endif - #else - #ifdef _DLL - #pragma comment(lib, "StormLibRUD.lib") // Release Unicode CRT-DLL version - #else - #pragma comment(lib, "StormLibRUS.lib") // Release Unicode CRT-LIB version - #endif - #endif - #endif - -#endif +// #if defined(_MSC_VER) && !defined(__STORMLIB_SELF__) +// +// #ifdef _DEBUG // DEBUG VERSIONS +// #ifndef _UNICODE +// #ifdef _DLL +// #pragma comment(lib, "StormLibDAD.lib") // Debug Ansi CRT-DLL version +// #else +// #pragma comment(lib, "StormLibDAS.lib") // Debug Ansi CRT-LIB version +// #endif +// #else +// #ifdef _DLL +// #pragma comment(lib, "StormLibDUD.lib") // Debug Unicode CRT-DLL version +// #else +// #pragma comment(lib, "StormLibDUS.lib") // Debug Unicode CRT-LIB version +// #endif +// #endif +// #else // RELEASE VERSIONS +// #ifndef _UNICODE +// #ifdef _DLL +// #pragma comment(lib, "StormLibRAD.lib") // Release Ansi CRT-DLL version +// #else +// #pragma comment(lib, "StormLibRAS.lib") // Release Ansi CRT-LIB version +// #endif +// #else +// #ifdef _DLL +// #pragma comment(lib, "StormLibRUD.lib") // Release Unicode CRT-DLL version +// #else +// #pragma comment(lib, "StormLibRUS.lib") // Release Unicode CRT-LIB version +// #endif +// #endif +// #endif +// +// #endif //----------------------------------------------------------------------------- // Defines