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/include/IceBox/Config.h | |
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/include/IceBox/Config.h')
-rw-r--r-- | cpp/include/IceBox/Config.h | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/cpp/include/IceBox/Config.h b/cpp/include/IceBox/Config.h new file mode 100644 index 00000000000..61a451bd5e5 --- /dev/null +++ b/cpp/include/IceBox/Config.h @@ -0,0 +1,28 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. +// +// This copy of Ice is licensed to you under the terms described in the +// ICE_LICENSE file included in this distribution. +// +// ********************************************************************** + +#ifndef ICE_BOX_CONFIG_H +#define ICE_BOX_CONFIG_H + +#ifdef _MSC_VER +// +// Automatically link with IceBox[D].lib +// +# if defined(ICE_STATIC_LIBS) +# pragma comment(lib, "IceBox.lib") +# elif !defined(ICE_BOX_API_EXPORTS) +# if defined(_DEBUG) +# pragma comment(lib, "IceBoxD.lib") +# else +# pragma comment(lib, "IceBox.lib") +# endif +# endif +#endif + +#endif |