diff options
| author | Jose <jose@zeroc.com> | 2014-10-08 01:07:13 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-10-08 01:07:13 +0200 |
| commit | 3a98e0453a7d8367e478eff8c742b14835da7603 (patch) | |
| tree | bfeb6335ccc9d0b0ef99118e49812e5f7459e305 /cpp/src/IceXML | |
| parent | Windows thirdparty distribution updates (diff) | |
| download | ice-3a98e0453a7d8367e478eff8c742b14835da7603.tar.bz2 ice-3a98e0453a7d8367e478eff8c742b14835da7603.tar.xz ice-3a98e0453a7d8367e478eff8c742b14835da7603.zip | |
Several Windows build fixes:
ICE-3420 - Force link failure for debug/release mismatch?
Update VS add-in to not add C++ libraries
Fixed WinRT builds
Fixed Python Windows builds
Diffstat (limited to 'cpp/src/IceXML')
| -rw-r--r-- | cpp/src/IceXML/Parser.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/cpp/src/IceXML/Parser.h b/cpp/src/IceXML/Parser.h index 09629e67a9c..e33d4ff526b 100644 --- a/cpp/src/IceXML/Parser.h +++ b/cpp/src/IceXML/Parser.h @@ -25,6 +25,21 @@ # endif #endif +// +// Automatically link IceXML[D].lib with Visual C++ +// +#ifdef _MSC_VER +# if defined(ICE_STATIC_LIBS) +# pragma comment(lib, "IceXML.lib") +# elif !defined(ICE_XML_API_EXPORTS) +# if defined(_DEBUG) +# pragma comment(lib, "IceXMLD.lib") +# else +# pragma comment(lib, "IceXML.lib") +# endif +# endif +#endif + namespace IceXML { |