diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2013-02-25 14:09:39 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2013-02-25 14:09:39 +0100 |
| commit | 38f6c7c5f4625128ef0a9dc39b47b79e35354427 (patch) | |
| tree | 8e797386cf46f88eca49d07305439be83e221c3e /cpp | |
| parent | Fixed ICE-5278 - No compiler check for PHP build if USE_BIN_DIST=yes (diff) | |
| download | ice-38f6c7c5f4625128ef0a9dc39b47b79e35354427.tar.bz2 ice-38f6c7c5f4625128ef0a9dc39b47b79e35354427.tar.xz ice-38f6c7c5f4625128ef0a9dc39b47b79e35354427.zip | |
Fixed ICE-5273 - Removed LTCG from ARFLAGS, fixed build failure on WinRT
Diffstat (limited to 'cpp')
| -rwxr-xr-x | cpp/config/Make.rules.msvc | 4 | ||||
| -rw-r--r-- | cpp/src/Ice/ConnectionI.cpp | 4 | ||||
| -rw-r--r-- | cpp/test/Ice/binding/AllTests.cpp | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/cpp/config/Make.rules.msvc b/cpp/config/Make.rules.msvc index 04e765baa7a..afda1337699 100755 --- a/cpp/config/Make.rules.msvc +++ b/cpp/config/Make.rules.msvc @@ -47,18 +47,18 @@ CPPFLAGS = $(CPPFLAGS) -MP !if "$(OPTIMIZE)" == "yes" CPPFLAGS = $(CPPFLAGS) -O2 -DNDEBUG -MD +CONFIG = Retail !if "$(RELEASEPDBS)" == "yes" CPPFLAGS = $(CPPFLAGS) -Zi -Oy- !endif -ARFLAGS = $(ARFLAGS) /LTCG -CONFIG = Retail !else CPPFLAGS = $(CPPFLAGS) -Zi -Od -D_DEBUG -MDd -RTC1 CONFIG = Debug + !endif !if "$(STATICLIBS)" == "yes" diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp index 4e841872103..ca0be9dc19d 100644 --- a/cpp/src/Ice/ConnectionI.cpp +++ b/cpp/src/Ice/ConnectionI.cpp @@ -25,7 +25,9 @@ #include <Ice/LocalException.h> #include <Ice/ReferenceFactory.h> // For createProxy(). #include <Ice/ProxyFactory.h> // For createProxy(). -#include <bzlib.h> +#ifndef ICE_OS_WINRT +# include <bzlib.h> +#endif using namespace std; using namespace Ice; diff --git a/cpp/test/Ice/binding/AllTests.cpp b/cpp/test/Ice/binding/AllTests.cpp index 52af48ab5ec..2e98bcb7bed 100644 --- a/cpp/test/Ice/binding/AllTests.cpp +++ b/cpp/test/Ice/binding/AllTests.cpp @@ -846,7 +846,7 @@ allTests(const Ice::CommunicatorPtr& communicator) serverProps.push_back(localipv4); serverProps.push_back(localipv6); -#ifdef _WIN32 +#if defined(_WIN32) && !defined(ICE_OS_WINRT) OSVERSIONINFO ver; ver.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); GetVersionEx(&ver); |