diff options
author | Benoit Foucher <benoit@zeroc.com> | 2012-11-08 10:25:32 +0100 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2012-11-08 10:25:32 +0100 |
commit | 7310ad264e17f639fb58dd947ef1c31295e4501c (patch) | |
tree | 3cb77562f0c445da903c1ae09ee2b6d80c139a6a /cpp/src/Ice/DynamicLibrary.cpp | |
parent | Updated GUI online help to use doc.zeroc.com, in a web browser (diff) | |
download | ice-7310ad264e17f639fb58dd947ef1c31295e4501c.tar.bz2 ice-7310ad264e17f639fb58dd947ef1c31295e4501c.tar.xz ice-7310ad264e17f639fb58dd947ef1c31295e4501c.zip |
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.
Diffstat (limited to 'cpp/src/Ice/DynamicLibrary.cpp')
-rw-r--r-- | cpp/src/Ice/DynamicLibrary.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 |