diff options
| author | Jose <jose@zeroc.com> | 2018-06-20 10:08:09 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2018-06-20 10:08:09 +0200 |
| commit | b41688ffb095e096be152b116e0d34f04fdfe42d (patch) | |
| tree | 97c20d2fe2d9a8fabc6df7a2964e5f900408b1b1 /cpp/test/uwp/controller | |
| parent | Port Ice/scope test to scripting languages (diff) | |
| download | ice-b41688ffb095e096be152b116e0d34f04fdfe42d.tar.bz2 ice-b41688ffb095e096be152b116e0d34f04fdfe42d.tar.xz ice-b41688ffb095e096be152b116e0d34f04fdfe42d.zip | |
Ice/scope fix Android and UWP builds
Diffstat (limited to 'cpp/test/uwp/controller')
| -rw-r--r-- | cpp/test/uwp/controller/msbuild/controller.vcxproj | 24 | ||||
| -rw-r--r-- | cpp/test/uwp/controller/msbuild/controller.vcxproj.filters | 24 |
2 files changed, 48 insertions, 0 deletions
diff --git a/cpp/test/uwp/controller/msbuild/controller.vcxproj b/cpp/test/uwp/controller/msbuild/controller.vcxproj index d89526185c1..8ecabd7a99e 100644 --- a/cpp/test/uwp/controller/msbuild/controller.vcxproj +++ b/cpp/test/uwp/controller/msbuild/controller.vcxproj @@ -329,6 +329,30 @@ <None Include="..\..\..\IceSSL\certs\s_rsa_ca1_pub.pem"> <DeploymentContent>true</DeploymentContent> </None> + <None Include="..\..\..\Ice\scope\msbuild\uwp\client\Win32\Debug\Ice_scope_client.dll"> + <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent> + </None> + <None Include="..\..\..\Ice\scope\msbuild\uwp\client\Win32\Release\Ice_scope_client.dll"> + <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent> + </None> + <None Include="..\..\..\Ice\scope\msbuild\uwp\client\x64\Debug\Ice_scope_client.dll"> + <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent> + </None> + <None Include="..\..\..\Ice\scope\msbuild\uwp\client\x64\Release\Ice_scope_client.dll"> + <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent> + </None> + <None Include="..\..\..\Ice\scope\msbuild\uwp\server\Win32\Debug\Ice_scope_server.dll"> + <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent> + </None> + <None Include="..\..\..\Ice\scope\msbuild\uwp\server\Win32\Release\Ice_scope_server.dll"> + <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent> + </None> + <None Include="..\..\..\Ice\scope\msbuild\uwp\server\x64\Debug\Ice_scope_server.dll"> + <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent> + </None> + <None Include="..\..\..\Ice\scope\msbuild\uwp\server\x64\Release\Ice_scope_server.dll"> + <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent> + </None> <None Include="controller_TemporaryKey.pfx" /> <SliceCompile Include="..\..\..\..\..\scripts\Controller.ice" /> <None Include="packages.config" /> diff --git a/cpp/test/uwp/controller/msbuild/controller.vcxproj.filters b/cpp/test/uwp/controller/msbuild/controller.vcxproj.filters index 834dc7b38d2..1b6da532335 100644 --- a/cpp/test/uwp/controller/msbuild/controller.vcxproj.filters +++ b/cpp/test/uwp/controller/msbuild/controller.vcxproj.filters @@ -1779,6 +1779,30 @@ <Filter>Tests\ARM\Release</Filter> </None> <None Include="packages.config" /> + <None Include="..\..\..\Ice\scope\msbuild\uwp\client\x64\Release\Ice_scope_client.dll"> + <Filter>Tests\x64\Release</Filter> + </None> + <None Include="..\..\..\Ice\scope\msbuild\uwp\server\x64\Release\Ice_scope_server.dll"> + <Filter>Tests\x64\Release</Filter> + </None> + <None Include="..\..\..\Ice\scope\msbuild\uwp\client\x64\Debug\Ice_scope_client.dll"> + <Filter>Tests\x64\Debug</Filter> + </None> + <None Include="..\..\..\Ice\scope\msbuild\uwp\server\x64\Debug\Ice_scope_server.dll"> + <Filter>Tests\x64\Debug</Filter> + </None> + <None Include="..\..\..\Ice\scope\msbuild\uwp\server\Win32\Debug\Ice_scope_server.dll"> + <Filter>Tests\Win32\Debug</Filter> + </None> + <None Include="..\..\..\Ice\scope\msbuild\uwp\client\Win32\Debug\Ice_scope_client.dll"> + <Filter>Tests\Win32\Debug</Filter> + </None> + <None Include="..\..\..\Ice\scope\msbuild\uwp\client\Win32\Release\Ice_scope_client.dll"> + <Filter>Tests\Win32\Release</Filter> + </None> + <None Include="..\..\..\Ice\scope\msbuild\uwp\server\Win32\Release\Ice_scope_server.dll"> + <Filter>Tests\Win32\Release</Filter> + </None> </ItemGroup> <ItemGroup> <SliceCompile Include="..\..\..\..\..\scripts\Controller.ice"> |