diff options
| author | Jose <jose@zeroc.com> | 2016-02-26 20:46:27 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-02-26 20:46:27 +0100 |
| commit | 62cba8cd46a535585a4422daab489f114feab6f3 (patch) | |
| tree | c77e9cec24a570b06024a3c6a1552b8e6eb20ec6 /cpp/test/Ice/plugin/Client.cpp | |
| parent | updating changelog for ICE-6844 (diff) | |
| download | ice-62cba8cd46a535585a4422daab489f114feab6f3.tar.bz2 ice-62cba8cd46a535585a4422daab489f114feab6f3.tar.xz ice-62cba8cd46a535585a4422daab489f114feab6f3.zip | |
Windows msbuild build updates
Diffstat (limited to 'cpp/test/Ice/plugin/Client.cpp')
| -rw-r--r-- | cpp/test/Ice/plugin/Client.cpp | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/cpp/test/Ice/plugin/Client.cpp b/cpp/test/Ice/plugin/Client.cpp index 47f2ea339c4..6e7647b0c41 100644 --- a/cpp/test/Ice/plugin/Client.cpp +++ b/cpp/test/Ice/plugin/Client.cpp @@ -126,10 +126,27 @@ main(int argc, char* argv[]) } cout << "ok" << endl; -#ifdef ICE_OS_WINRT +#if !defined(_WIN32) + string pluginDir = "plugins/"; +#elif defined(ICE_OS_WINRT) string pluginDir = "plugins/winrt/"; #else - string pluginDir = "plugins/"; + string pluginDir = "msbuild/testplugin/"; +# if defined(_M_X64) + pluginDir += "x64/"; +# else + pluginDir += "Win32/"; +# endif + +# if defined(ICE_CPP11_MAPPING) + pluginDir += "Cpp11-"; +# endif + +# if defined(_DEBUG) + pluginDir += "Debug/"; +# else + pluginDir += "Release/"; +# endif #endif cout << "testing a simple plug-in... " << flush; |