From 7310ad264e17f639fb58dd947ef1c31295e4501c Mon Sep 17 00:00:00 2001 From: Benoit Foucher Date: Thu, 8 Nov 2012 10:25:32 +0100 Subject: Fixed MinGW port - The build no longer requires Cygwin - Running the tests no longer requires setting CPP_COMPILER, TestUtil.py che for RI_DEVKIT in the environment to figure out if running with MinGW devki - DynamicLibrary no longer appends the "d" suffix when compiling with debug - COMPSUFFIX is now defined when compiling Ice - Much simplified the build system by removing all the checks for MinGW in makefiles, MinGW settings are now located to Make.rules.MINGW only. - Fixed allTests.py to skip plugin and metrics tests. - Fixed build instructions. --- cpp/src/Ice/DynamicLibrary.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cpp/src/Ice/DynamicLibrary.cpp') diff --git a/cpp/src/Ice/DynamicLibrary.cpp b/cpp/src/Ice/DynamicLibrary.cpp index ab724a9847a..4fa7f1499e2 100644 --- a/cpp/src/Ice/DynamicLibrary.cpp +++ b/cpp/src/Ice/DynamicLibrary.cpp @@ -142,7 +142,7 @@ IceInternal::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool useIc lib += version; -# ifdef _DEBUG +# if defined(_DEBUG) && !defined(__MINGW32__) lib += 'd'; # endif -- cgit v1.2.3