diff options
| author | Bernard Normier <bernard@zeroc.com> | 2016-05-11 17:50:09 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2016-05-11 17:50:09 -0400 |
| commit | ff76da01915482dc5c5bcc693789642882958d64 (patch) | |
| tree | b57639e7490f850fbec23c50f159c408689234e5 /cpp/src | |
| parent | cleaning up stream API in C++/Java/JS (diff) | |
| download | ice-ff76da01915482dc5c5bcc693789642882958d64.tar.bz2 ice-ff76da01915482dc5c5bcc693789642882958d64.tar.xz ice-ff76da01915482dc5c5bcc693789642882958d64.zip | |
IceUtil and Slice msbuild updates
Diffstat (limited to 'cpp/src')
45 files changed, 589 insertions, 1027 deletions
diff --git a/cpp/src/Glacier2Lib/msbuild/glacier2uwp++11/glacier2uwp++11.vcxproj b/cpp/src/Glacier2Lib/msbuild/glacier2uwp++11/glacier2uwp++11.vcxproj index ed7bf24ccb2..63a293747bc 100644 --- a/cpp/src/Glacier2Lib/msbuild/glacier2uwp++11/glacier2uwp++11.vcxproj +++ b/cpp/src/Glacier2Lib/msbuild/glacier2uwp++11/glacier2uwp++11.vcxproj @@ -35,6 +35,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.uwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -732,7 +734,7 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj b/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj index 69442a2579c..01601b4f3d4 100644 --- a/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj +++ b/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj @@ -75,7 +75,7 @@ <PreprocessorDefinitions>ICE_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>advapi32.lib;ws2_32.lib;Iphlpapi.lib</AdditionalDependencies> + <AdditionalDependencies>advapi32.lib;ws2_32.lib;Iphlpapi.lib;rpcrt4.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -83,7 +83,7 @@ <PreprocessorDefinitions>ICE_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>advapi32.lib;ws2_32.lib;Iphlpapi.lib</AdditionalDependencies> + <AdditionalDependencies>advapi32.lib;ws2_32.lib;Iphlpapi.lib;rpcrt4.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -91,7 +91,7 @@ <PreprocessorDefinitions>ICE_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>advapi32.lib;ws2_32.lib;Iphlpapi.lib</AdditionalDependencies> + <AdditionalDependencies>advapi32.lib;ws2_32.lib;Iphlpapi.lib;rpcrt4.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -99,7 +99,7 @@ <PreprocessorDefinitions>ICE_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>advapi32.lib;ws2_32.lib;Iphlpapi.lib</AdditionalDependencies> + <AdditionalDependencies>advapi32.lib;ws2_32.lib;Iphlpapi.lib;rpcrt4.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> @@ -188,6 +188,7 @@ </CustomBuild> </ItemGroup> <ItemGroup> + <ClCompile Include="..\..\..\IceUtil\*.cpp" /> <ClCompile Include="..\..\Acceptor.cpp" /> <ClCompile Include="..\..\ACM.cpp" /> <ClCompile Include="..\..\Application.cpp" /> diff --git a/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj.filters b/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj.filters index e892ad860af..13df6b362e1 100644 --- a/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj.filters +++ b/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj.filters @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <Filter Include="Source Files"> @@ -953,6 +953,9 @@ <ClCompile Include="x64\Release\Version.cpp"> <Filter>Source Files\x64\Release</Filter> </ClCompile> + <ClCompile Include="..\..\..\IceUtil\*.cpp"> + <Filter>Source Files</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <CustomBuild Include="..\..\EventLoggerMsg.mc"> @@ -1432,4 +1435,4 @@ <Filter>Header Files\x64\Release</Filter> </ClInclude> </ItemGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/cpp/src/Ice/msbuild/ice/ice.vcxproj b/cpp/src/Ice/msbuild/ice/ice.vcxproj index 917cfae4c56..4cc4cd8cd87 100644 --- a/cpp/src/Ice/msbuild/ice/ice.vcxproj +++ b/cpp/src/Ice/msbuild/ice/ice.vcxproj @@ -80,7 +80,7 @@ <PreprocessorDefinitions>ICE_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>advapi32.lib;ws2_32.lib;Iphlpapi.lib</AdditionalDependencies> + <AdditionalDependencies>advapi32.lib;ws2_32.lib;Iphlpapi.lib;rpcrt4.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -88,7 +88,7 @@ <PreprocessorDefinitions>ICE_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>advapi32.lib;ws2_32.lib;Iphlpapi.lib</AdditionalDependencies> + <AdditionalDependencies>advapi32.lib;ws2_32.lib;Iphlpapi.lib;rpcrt4.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -96,7 +96,7 @@ <PreprocessorDefinitions>ICE_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>advapi32.lib;ws2_32.lib;Iphlpapi.lib</AdditionalDependencies> + <AdditionalDependencies>advapi32.lib;ws2_32.lib;Iphlpapi.lib;rpcrt4.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -104,7 +104,7 @@ <PreprocessorDefinitions>ICE_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>advapi32.lib;ws2_32.lib;Iphlpapi.lib</AdditionalDependencies> + <AdditionalDependencies>advapi32.lib;ws2_32.lib;Iphlpapi.lib;rpcrt4.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> @@ -193,6 +193,7 @@ </CustomBuild> </ItemGroup> <ItemGroup> + <ClCompile Include="..\..\..\IceUtil\*.cpp" /> <ClCompile Include="..\..\Acceptor.cpp" /> <ClCompile Include="..\..\ACM.cpp" /> <ClCompile Include="..\..\Application.cpp" /> diff --git a/cpp/src/Ice/msbuild/ice/ice.vcxproj.filters b/cpp/src/Ice/msbuild/ice/ice.vcxproj.filters index e4aae5c48c4..cb39feea931 100644 --- a/cpp/src/Ice/msbuild/ice/ice.vcxproj.filters +++ b/cpp/src/Ice/msbuild/ice/ice.vcxproj.filters @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <Filter Include="Source Files"> @@ -952,6 +952,9 @@ <ClCompile Include="x64\Release\Version.cpp"> <Filter>Source Files\x64\Release</Filter> </ClCompile> + <ClCompile Include="..\..\..\IceUtil\*.cpp"> + <Filter>Source Files</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <None Include="packages.config" /> @@ -1431,4 +1434,4 @@ <Filter>Header Files\x64\Release</Filter> </ClInclude> </ItemGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj b/cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj index 6c344dba9c9..baebb88fec5 100644 --- a/cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj +++ b/cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj @@ -35,6 +35,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.uwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -134,6 +136,28 @@ </ClCompile> </ItemDefinitionGroup> <ItemGroup> + <ClCompile Include="..\..\..\IceUtil\ArgVector.cpp" /> + <ClCompile Include="..\..\..\IceUtil\Cond.cpp" /> + <ClCompile Include="..\..\..\IceUtil\ConvertUTF.cpp" /> + <ClCompile Include="..\..\..\IceUtil\CountDownLatch.cpp" /> + <ClCompile Include="..\..\..\IceUtil\FileUtil.cpp" /> + <ClCompile Include="..\..\..\IceUtil\InputUtil.cpp" /> + <ClCompile Include="..\..\..\IceUtil\MutexProtocol.cpp" /> + <ClCompile Include="..\..\..\IceUtil\Options.cpp" /> + <ClCompile Include="..\..\..\IceUtil\OutputUtil.cpp" /> + <ClCompile Include="..\..\..\IceUtil\Random.cpp" /> + <ClCompile Include="..\..\..\IceUtil\RecMutex.cpp" /> + <ClCompile Include="..\..\..\IceUtil\SHA1.cpp" /> + <ClCompile Include="..\..\..\IceUtil\Shared.cpp" /> + <ClCompile Include="..\..\..\IceUtil\StringConverter.cpp" /> + <ClCompile Include="..\..\..\IceUtil\StringUtil.cpp" /> + <ClCompile Include="..\..\..\IceUtil\Thread.cpp" /> + <ClCompile Include="..\..\..\IceUtil\ThreadException.cpp" /> + <ClCompile Include="..\..\..\IceUtil\Time.cpp" /> + <ClCompile Include="..\..\..\IceUtil\Timer.cpp" /> + <ClCompile Include="..\..\..\IceUtil\Unicode.cpp" /> + <ClCompile Include="..\..\..\IceUtil\UtilException.cpp" /> + <ClCompile Include="..\..\..\IceUtil\UUID.cpp" /> <ClCompile Include="..\..\Acceptor.cpp" /> <ClCompile Include="..\..\ACM.cpp" /> <ClCompile Include="..\..\AsyncResult.cpp" /> @@ -3543,7 +3567,7 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj.filters b/cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj.filters index 37d9166831a..a2eeca3b49e 100644 --- a/cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj.filters +++ b/cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj.filters @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <Filter Include="Header Files"> @@ -1036,6 +1036,72 @@ <ClCompile Include="x64\Release\Version.cpp"> <Filter>Source Files\x64\Release</Filter> </ClCompile> + <ClCompile Include="..\..\..\IceUtil\ArgVector.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\IceUtil\Cond.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\IceUtil\ConvertUTF.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\IceUtil\CountDownLatch.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\IceUtil\FileUtil.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\IceUtil\InputUtil.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\IceUtil\MutexProtocol.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\IceUtil\Options.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\IceUtil\OutputUtil.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\IceUtil\Random.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\IceUtil\RecMutex.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\IceUtil\SHA1.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\IceUtil\Shared.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\IceUtil\StringConverter.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\IceUtil\StringUtil.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\IceUtil\Thread.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\IceUtil\ThreadException.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\IceUtil\Time.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\IceUtil\Timer.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\IceUtil\Unicode.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\IceUtil\UtilException.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\IceUtil\UUID.cpp"> + <Filter>Source Files</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <IceBuilder Include="..\..\..\..\..\slice\Ice\BuiltinSequences.ice"> @@ -1860,4 +1926,4 @@ <Filter>Header Files\x64\Release</Filter> </ClInclude> </ItemGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/cpp/src/IceDiscovery/msbuild/icediscoveryuwp++11/icediscoveryuwp++11.vcxproj b/cpp/src/IceDiscovery/msbuild/icediscoveryuwp++11/icediscoveryuwp++11.vcxproj index 868a539fd62..4f4204f988c 100644 --- a/cpp/src/IceDiscovery/msbuild/icediscoveryuwp++11/icediscoveryuwp++11.vcxproj +++ b/cpp/src/IceDiscovery/msbuild/icediscoveryuwp++11/icediscoveryuwp++11.vcxproj @@ -35,6 +35,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.uwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -191,7 +193,7 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/cpp/src/IceGridLib/msbuild/icegriduwp++11/icegriduwp++11.vcxproj b/cpp/src/IceGridLib/msbuild/icegriduwp++11/icegriduwp++11.vcxproj index 9edf4c62c57..6e0bcb71b16 100644 --- a/cpp/src/IceGridLib/msbuild/icegriduwp++11/icegriduwp++11.vcxproj +++ b/cpp/src/IceGridLib/msbuild/icegriduwp++11/icegriduwp++11.vcxproj @@ -35,6 +35,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.uwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -816,7 +818,7 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscoveryuwp++11/icelocatordiscoveryuwp++11.vcxproj b/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscoveryuwp++11/icelocatordiscoveryuwp++11.vcxproj index 51b833acbb0..4c5c788da1f 100644 --- a/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscoveryuwp++11/icelocatordiscoveryuwp++11.vcxproj +++ b/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscoveryuwp++11/icelocatordiscoveryuwp++11.vcxproj @@ -35,6 +35,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.uwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -191,7 +193,7 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/cpp/src/IceSSL/msbuild/icessluwp++11/icessluwp++11.vcxproj b/cpp/src/IceSSL/msbuild/icessluwp++11/icessluwp++11.vcxproj index d19d01fb635..2b35204da8a 100644 --- a/cpp/src/IceSSL/msbuild/icessluwp++11/icessluwp++11.vcxproj +++ b/cpp/src/IceSSL/msbuild/icessluwp++11/icessluwp++11.vcxproj @@ -35,6 +35,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.uwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -314,7 +316,7 @@ <ClInclude Include="..\..\uwp\TransceiverI.h" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/cpp/src/IceStormLib/msbuild/icestormuwp++11/icestormuwp++11.vcxproj b/cpp/src/IceStormLib/msbuild/icestormuwp++11/icestormuwp++11.vcxproj index e16c1b72654..a6ad8ec6525 100644 --- a/cpp/src/IceStormLib/msbuild/icestormuwp++11/icestormuwp++11.vcxproj +++ b/cpp/src/IceStormLib/msbuild/icestormuwp++11/icestormuwp++11.vcxproj @@ -35,6 +35,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.uwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -306,7 +308,7 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/cpp/src/IceUtil/IceUtil.rc b/cpp/src/IceUtil/IceUtil.rc deleted file mode 100644 index ec47aa3c60e..00000000000 --- a/cpp/src/IceUtil/IceUtil.rc +++ /dev/null @@ -1,38 +0,0 @@ -#include "winver.h" - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,7,51,0 - PRODUCTVERSION 3,7,51,0 - FILEFLAGSMASK VS_FFI_FILEFLAGSMASK -#ifdef _DEBUG - FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "iceutil37a0d\0" - #define ORIGINALFILENAME "iceutil37a0d.dll\0" -#else - FILEFLAGS 0x0L - #define INTERNALNAME "iceutil37a0\0" - #define ORIGINALFILENAME "iceutil37a0.dll\0" -#endif - FILEOS 0x4L - FILETYPE VFT_DLL - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904e4" - BEGIN - VALUE "CompanyName", "ZeroC, Inc.\0" - VALUE "FileDescription", "Ice C++ Utility Library\0" - VALUE "FileVersion", "3.7a0\0" - VALUE "InternalName", INTERNALNAME - VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" - VALUE "OriginalFilename", ORIGINALFILENAME - VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.7a0\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1252 - END -END diff --git a/cpp/src/IceUtil/msbuild/iceutil++11/iceutil++11.vcxproj b/cpp/src/IceUtil/msbuild/iceutil++11/iceutil++11.vcxproj deleted file mode 100644 index f22527e8f3f..00000000000 --- a/cpp/src/IceUtil/msbuild/iceutil++11/iceutil++11.vcxproj +++ /dev/null @@ -1,175 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{7B04E1F5-B384-44A5-8F46-E0A3FB0F23B1}</ProjectGuid> - <RootNamespace>IceUtil C++11</RootNamespace> - <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp11.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Label="Shared"> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <PreprocessorDefinitions>ICE_UTIL_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Link> - <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <PreprocessorDefinitions>ICE_UTIL_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Link> - <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <PreprocessorDefinitions>ICE_UTIL_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Link> - <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <PreprocessorDefinitions>ICE_UTIL_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Link> - <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> - </Link> - </ItemDefinitionGroup> - <ItemGroup> - <ClCompile Include="..\..\ArgVector.cpp" /> - <ClCompile Include="..\..\Cond.cpp" /> - <ClCompile Include="..\..\ConvertUTF.cpp" /> - <ClCompile Include="..\..\CountDownLatch.cpp" /> - <ClCompile Include="..\..\CtrlCHandler.cpp" /> - <ClCompile Include="..\..\UtilException.cpp" /> - <ClCompile Include="..\..\FileUtil.cpp" /> - <ClCompile Include="..\..\InputUtil.cpp" /> - <ClCompile Include="..\..\MutexProtocol.cpp" /> - <ClCompile Include="..\..\Options.cpp" /> - <ClCompile Include="..\..\OutputUtil.cpp" /> - <ClCompile Include="..\..\Random.cpp" /> - <ClCompile Include="..\..\RecMutex.cpp" /> - <ClCompile Include="..\..\SHA1.cpp" /> - <ClCompile Include="..\..\Shared.cpp" /> - <ClCompile Include="..\..\StringConverter.cpp" /> - <ClCompile Include="..\..\StringUtil.cpp" /> - <ClCompile Include="..\..\Thread.cpp" /> - <ClCompile Include="..\..\ThreadException.cpp" /> - <ClCompile Include="..\..\Time.cpp" /> - <ClCompile Include="..\..\Timer.cpp" /> - <ClCompile Include="..\..\Unicode.cpp" /> - <ClCompile Include="..\..\UUID.cpp" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\..\..\..\include\IceUtil\Atomic.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Cond.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Config.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\CountDownLatch.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\CtrlCHandler.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\DisableWarnings.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Exception.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\FileUtil.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Functional.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Handle.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\IceUtil.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\IconvStringConverter.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\InputUtil.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Iterator.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Lock.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Monitor.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Mutex.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\MutexProtocol.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\MutexPtrLock.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\MutexPtrTryLock.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Optional.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Options.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\OutputUtil.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\PopDisableWarnings.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\PushDisableWarnings.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Random.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\RecMutex.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\ScannerConfig.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\ScopedArray.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\SHA1.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Shared.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\StringConverter.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\StringUtil.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Thread.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\ThreadException.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Time.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Timer.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\UndefSysMacros.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\UniquePtr.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\UUID.h" /> - <ClInclude Include="..\..\ArgVector.h" /> - <ClInclude Include="..\..\ConvertUTF.h" /> - <ClInclude Include="..\..\StopWatch.h" /> - <ClInclude Include="..\..\Unicode.h" /> - </ItemGroup> - <ItemGroup> - <ResourceCompile Include="..\..\IceUtil.rc" /> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project> diff --git a/cpp/src/IceUtil/msbuild/iceutil++11/iceutil++11.vcxproj.filters b/cpp/src/IceUtil/msbuild/iceutil++11/iceutil++11.vcxproj.filters deleted file mode 100644 index c097d85db0f..00000000000 --- a/cpp/src/IceUtil/msbuild/iceutil++11/iceutil++11.vcxproj.filters +++ /dev/null @@ -1,227 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Filter Include="Source Files"> - <UniqueIdentifier>{47ED10C7-EC63-4EA7-A7AE-D7378402851B}</UniqueIdentifier> - <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> - </Filter> - <Filter Include="Header Files"> - <UniqueIdentifier>{11279344-6550-4CA2-9A43-20B50E3BDD4B}</UniqueIdentifier> - <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions> - </Filter> - <Filter Include="Resource Files"> - <UniqueIdentifier>{84B010E6-6952-4B4B-A751-C6F9CDF443F4}</UniqueIdentifier> - <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> - </Filter> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\..\ArgVector.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\Cond.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\ConvertUTF.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\CountDownLatch.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\CtrlCHandler.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\UtilException.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\FileUtil.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\InputUtil.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\MutexProtocol.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\Options.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\OutputUtil.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\Random.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\RecMutex.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\SHA1.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\Shared.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\StringConverter.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\StringUtil.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\Thread.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\ThreadException.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\Time.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\Timer.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\Unicode.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\UUID.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\..\..\..\include\IceUtil\Atomic.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Cond.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Config.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\CountDownLatch.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\CtrlCHandler.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\DisableWarnings.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Exception.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\FileUtil.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Functional.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Handle.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\IceUtil.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\IconvStringConverter.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\InputUtil.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Iterator.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Lock.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Monitor.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Mutex.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\MutexProtocol.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\MutexPtrLock.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\MutexPtrTryLock.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Optional.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Options.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\OutputUtil.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\PopDisableWarnings.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\PushDisableWarnings.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Random.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\RecMutex.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\ScannerConfig.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\ScopedArray.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\SHA1.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Shared.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\StringConverter.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\StringUtil.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Thread.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\ThreadException.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Time.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Timer.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\UndefSysMacros.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\UniquePtr.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\UUID.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\ArgVector.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\ConvertUTF.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\StopWatch.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\Unicode.h"> - <Filter>Header Files</Filter> - </ClInclude> - </ItemGroup> - <ItemGroup> - <ResourceCompile Include="..\..\IceUtil.rc"> - <Filter>Resource Files</Filter> - </ResourceCompile> - </ItemGroup> -</Project> diff --git a/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj b/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj index 4a824edef45..eda08cf157d 100644 --- a/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj +++ b/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> @@ -25,22 +25,22 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> + <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> + <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> + <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> + <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> </PropertyGroup> @@ -62,37 +62,53 @@ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <TargetExt>.lib</TargetExt> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <TargetExt>.lib</TargetExt> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <TargetName>$(ProjectName)d</TargetName> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <TargetName>$(ProjectName)d</TargetName> + </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <PreprocessorDefinitions>ICE_UTIL_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> + <ClCompile /> <Link> <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> - <PreprocessorDefinitions>ICE_UTIL_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile /> <Link> <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <PreprocessorDefinitions>ICE_UTIL_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile /> <Link> <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> - <PreprocessorDefinitions>ICE_UTIL_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile /> <Link> <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> </Link> + <ClCompile> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> </ItemDefinitionGroup> <ItemGroup> <ClCompile Include="..\..\ArgVector.cpp" /> @@ -165,10 +181,7 @@ <ClInclude Include="..\..\StopWatch.h" /> <ClInclude Include="..\..\Unicode.h" /> </ItemGroup> - <ItemGroup> - <ResourceCompile Include="..\..\IceUtil.rc" /> - </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj.filters b/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj.filters index f008d4bf690..b60350fc4d0 100644 --- a/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj.filters +++ b/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj.filters @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <Filter Include="Source Files"> @@ -219,9 +219,4 @@ <Filter>Header Files</Filter> </ClInclude> </ItemGroup> - <ItemGroup> - <ResourceCompile Include="..\..\IceUtil.rc"> - <Filter>Resource Files</Filter> - </ResourceCompile> - </ItemGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/cpp/src/IceUtil/msbuild/iceutiluwp++11/iceutiluwp++11.vcxproj b/cpp/src/IceUtil/msbuild/iceutiluwp++11/iceutiluwp++11.vcxproj deleted file mode 100644 index f1812c98174..00000000000 --- a/cpp/src/IceUtil/msbuild/iceutiluwp++11/iceutiluwp++11.vcxproj +++ /dev/null @@ -1,203 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|ARM"> - <Configuration>Debug</Configuration> - <Platform>ARM</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|ARM"> - <Configuration>Release</Configuration> - <Platform>ARM</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{045BD844-1D32-41AB-9824-BE11617A0097}</ProjectGuid> - <DefaultLanguage>en-US</DefaultLanguage> - <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion> - <AppContainerApplication>true</AppContainerApplication> - <ApplicationType>Windows Store</ApplicationType> - <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> - <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> - <ApplicationTypeRevision>10.0</ApplicationTypeRevision> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.uwp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Label="Shared"> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <PreprocessorDefinitions>ICE_BUILDING_ICEUTIL;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> - <ClCompile> - <PreprocessorDefinitions>ICE_BUILDING_ICEUTIL;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <PreprocessorDefinitions>ICE_BUILDING_ICEUTIL;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Lib> - <AdditionalDependencies> - </AdditionalDependencies> - </Lib> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <PreprocessorDefinitions>ICE_BUILDING_ICEUTIL;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> - <ClCompile> - <PreprocessorDefinitions>ICE_BUILDING_ICEUTIL;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <PreprocessorDefinitions>ICE_BUILDING_ICEUTIL;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - </ItemDefinitionGroup> - <ItemGroup> - <ClCompile Include="..\..\ArgVector.cpp" /> - <ClCompile Include="..\..\Cond.cpp" /> - <ClCompile Include="..\..\ConvertUTF.cpp" /> - <ClCompile Include="..\..\CountDownLatch.cpp" /> - <ClCompile Include="..\..\UtilException.cpp" /> - <ClCompile Include="..\..\FileUtil.cpp" /> - <ClCompile Include="..\..\InputUtil.cpp" /> - <ClCompile Include="..\..\MutexProtocol.cpp" /> - <ClCompile Include="..\..\Options.cpp" /> - <ClCompile Include="..\..\OutputUtil.cpp" /> - <ClCompile Include="..\..\Random.cpp" /> - <ClCompile Include="..\..\RecMutex.cpp" /> - <ClCompile Include="..\..\SHA1.cpp" /> - <ClCompile Include="..\..\Shared.cpp" /> - <ClCompile Include="..\..\StringConverter.cpp" /> - <ClCompile Include="..\..\StringUtil.cpp" /> - <ClCompile Include="..\..\Thread.cpp" /> - <ClCompile Include="..\..\ThreadException.cpp" /> - <ClCompile Include="..\..\Time.cpp" /> - <ClCompile Include="..\..\Timer.cpp" /> - <ClCompile Include="..\..\Unicode.cpp" /> - <ClCompile Include="..\..\UUID.cpp" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\..\..\..\include\IceUtil\Atomic.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Cond.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Config.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\CountDownLatch.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\CtrlCHandler.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\DisableWarnings.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Exception.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\FileUtil.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Functional.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Handle.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\IceUtil.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\IconvStringConverter.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\InputUtil.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Iterator.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Lock.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Monitor.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Mutex.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\MutexProtocol.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\MutexPtrLock.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\MutexPtrTryLock.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Optional.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Options.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\OutputUtil.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\PopDisableWarnings.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\PushDisableWarnings.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Random.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\RecMutex.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\ScannerConfig.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\ScopedArray.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\SHA1.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Shared.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\StringConverter.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\StringUtil.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Thread.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\ThreadException.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Time.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Timer.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\UndefSysMacros.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\UniquePtr.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\UUID.h" /> - <ClInclude Include="..\..\ArgVector.h" /> - <ClInclude Include="..\..\ConvertUTF.h" /> - <ClInclude Include="..\..\StopWatch.h" /> - <ClInclude Include="..\..\Unicode.h" /> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project> diff --git a/cpp/src/IceUtil/msbuild/iceutiluwp++11/iceutiluwp++11.vcxproj.filters b/cpp/src/IceUtil/msbuild/iceutiluwp++11/iceutiluwp++11.vcxproj.filters deleted file mode 100644 index 1c5653d5a4e..00000000000 --- a/cpp/src/IceUtil/msbuild/iceutiluwp++11/iceutiluwp++11.vcxproj.filters +++ /dev/null @@ -1,216 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <ClCompile Include="..\..\ArgVector.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\ConvertUTF.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\Cond.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\CountDownLatch.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\UtilException.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\FileUtil.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\InputUtil.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\MutexProtocol.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\Options.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\OutputUtil.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\Random.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\RecMutex.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\SHA1.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\Unicode.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\Timer.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\Time.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\ThreadException.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\Thread.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\StringConverter.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\Shared.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\StringUtil.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\UUID.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\..\ArgVector.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Atomic.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Cond.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Config.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\ConvertUTF.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\CountDownLatch.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\CtrlCHandler.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\DisableWarnings.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Exception.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\FileUtil.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Functional.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\IceUtil.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\IconvStringConverter.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\InputUtil.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Iterator.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Lock.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Monitor.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Mutex.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\MutexProtocol.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\MutexPtrLock.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\MutexPtrTryLock.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Optional.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Options.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\OutputUtil.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\PopDisableWarnings.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\PushDisableWarnings.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Random.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\RecMutex.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\ScannerConfig.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\ScopedArray.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\SHA1.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Shared.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\StopWatch.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\StringConverter.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\StringUtil.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Thread.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\ThreadException.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Time.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Timer.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\UndefSysMacros.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\Unicode.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\UUID.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\UniquePtr.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Handle.h"> - <Filter>Header Files</Filter> - </ClInclude> - </ItemGroup> - <ItemGroup> - <Filter Include="Header Files"> - <UniqueIdentifier>{61a65a3d-af61-4bb7-b532-a2ec945fbc84}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files"> - <UniqueIdentifier>{ef63f803-e282-4ddb-a5b9-9dfc079b26be}</UniqueIdentifier> - </Filter> - <Filter Include="Resource Files"> - <UniqueIdentifier>{4a95b250-fe90-4762-9440-47baf982c6c4}</UniqueIdentifier> - </Filter> - </ItemGroup> -</Project> diff --git a/cpp/src/Slice/GrammarUtil.h b/cpp/src/Slice/GrammarUtil.h index 25d30c8086c..e11ec472a4b 100644 --- a/cpp/src/Slice/GrammarUtil.h +++ b/cpp/src/Slice/GrammarUtil.h @@ -48,7 +48,7 @@ typedef ::IceUtil::Handle<ClassIdTok> ClassIdTokPtr; // StringTok // ---------------------------------------------------------------------- -class SLICE_API StringTok : public GrammarBase +class StringTok : public GrammarBase { public: @@ -61,7 +61,7 @@ public: // StringListTok // ---------------------------------------------------------------------- -class SLICE_API StringListTok : public GrammarBase +class StringListTok : public GrammarBase { public: @@ -73,7 +73,7 @@ public: // TypeStringTok // ---------------------------------------------------------------------- -class SLICE_API TypeStringTok : public GrammarBase +class TypeStringTok : public GrammarBase { public: @@ -85,7 +85,7 @@ public: // TypeStringListTok // ---------------------------------------------------------------------- -class SLICE_API TypeStringListTok : public GrammarBase +class TypeStringListTok : public GrammarBase { public: @@ -97,7 +97,7 @@ public: // IntegerTok // ---------------------------------------------------------------------- -class SLICE_API IntegerTok : public GrammarBase +class IntegerTok : public GrammarBase { public: @@ -110,7 +110,7 @@ public: // FloatingTok // ---------------------------------------------------------------------- -class SLICE_API FloatingTok : public GrammarBase +class FloatingTok : public GrammarBase { public: @@ -123,7 +123,7 @@ public: // BoolTok // ---------------------------------------------------------------------- -class SLICE_API BoolTok : public GrammarBase +class BoolTok : public GrammarBase { public: @@ -135,7 +135,7 @@ public: // ExceptionListTok // ---------------------------------------------------------------------- -class SLICE_API ExceptionListTok : public GrammarBase +class ExceptionListTok : public GrammarBase { public: @@ -147,7 +147,7 @@ public: // ClassListTok // ---------------------------------------------------------------------- -class SLICE_API ClassListTok : public GrammarBase +class ClassListTok : public GrammarBase { public: @@ -159,7 +159,7 @@ public: // EnumeratorListTok // ---------------------------------------------------------------------- -class SLICE_API EnumeratorListTok : public GrammarBase +class EnumeratorListTok : public GrammarBase { public: @@ -171,7 +171,7 @@ public: // ConstDefTok // ---------------------------------------------------------------------- -class SLICE_API ConstDefTok : public GrammarBase +class ConstDefTok : public GrammarBase { public: @@ -183,7 +183,7 @@ public: // OptionalDefTok // ---------------------------------------------------------------------- -class SLICE_API OptionalDefTok : public GrammarBase +class OptionalDefTok : public GrammarBase { public: @@ -195,7 +195,7 @@ public: // ClassIdTok // ---------------------------------------------------------------------- -class SLICE_API ClassIdTok : public GrammarBase +class ClassIdTok : public GrammarBase { public: diff --git a/cpp/src/Slice/Slice.rc b/cpp/src/Slice/Slice.rc deleted file mode 100644 index 0f90d5b8279..00000000000 --- a/cpp/src/Slice/Slice.rc +++ /dev/null @@ -1,38 +0,0 @@ -#include "winver.h" - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,7,51,0 - PRODUCTVERSION 3,7,51,0 - FILEFLAGSMASK VS_FFI_FILEFLAGSMASK -#ifdef _DEBUG - FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "slice37a0d\0" - #define ORIGINALFILENAME "slice37a0d.dll\0" -#else - FILEFLAGS 0x0L - #define INTERNALNAME "slice37a0\0" - #define ORIGINALFILENAME "slice37a0.dll\0" -#endif - FILEOS 0x4L - FILETYPE VFT_DLL - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904e4" - BEGIN - VALUE "CompanyName", "ZeroC, Inc.\0" - VALUE "FileDescription", "Slice C++ Library\0" - VALUE "FileVersion", "3.7a0\0" - VALUE "InternalName", INTERNALNAME - VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" - VALUE "OriginalFilename", ORIGINALFILENAME - VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.7a0\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1252 - END -END diff --git a/cpp/src/Slice/msbuild/packages.config b/cpp/src/Slice/msbuild/packages.config deleted file mode 100644 index c12391e1a04..00000000000 --- a/cpp/src/Slice/msbuild/packages.config +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="mcpp.v120" version="2.7.2.6" targetFramework="native" /> - <package id="mcpp.v140" version="2.7.2.6" targetFramework="native" /> -</packages>
\ No newline at end of file diff --git a/cpp/src/Slice/msbuild/slice.vcxproj b/cpp/src/Slice/msbuild/slice.vcxproj index fb9d0403baa..5b5fcfe2651 100644 --- a/cpp/src/Slice/msbuild/slice.vcxproj +++ b/cpp/src/Slice/msbuild/slice.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> @@ -25,22 +25,22 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> + <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> + <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> + <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> + <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> </PropertyGroup> @@ -63,30 +63,41 @@ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <TargetExt>.lib</TargetExt> + <TargetName>$(ProjectName)d</TargetName> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <TargetExt>.lib</TargetExt> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <TargetExt>.lib</TargetExt> + <TargetName>$(ProjectName)d</TargetName> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <TargetExt>.lib</TargetExt> + </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> - <PreprocessorDefinitions>SLICE_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> - <PreprocessorDefinitions>SLICE_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <PreprocessorDefinitions>SLICE_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> - <PreprocessorDefinitions>SLICE_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> </ItemDefinitionGroup> <ItemGroup> - <ResourceCompile Include="..\Slice.rc" /> - </ItemGroup> - <ItemGroup> <ClCompile Include="..\Checksum.cpp" /> <ClCompile Include="..\CPlusPlusUtil.cpp" /> <ClCompile Include="..\CsUtil.cpp" /> @@ -126,19 +137,6 @@ <ClInclude Include="..\MD5.h" /> <ClInclude Include="..\MD5I.h" /> </ItemGroup> - <ItemGroup> - <None Include="packages.config" /> - </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.6\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.6\build\native\mcpp.v120.targets')" /> - <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.6\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.6\build\native\mcpp.v140.targets')" /> - </ImportGroup> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> - <PropertyGroup> - <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> - </PropertyGroup> - <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.6\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.6\build\native\mcpp.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.6\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.6\build\native\mcpp.v140.targets'))" /> - </Target> -</Project> + <ImportGroup Label="ExtensionTargets" /> +</Project>
\ No newline at end of file diff --git a/cpp/src/Slice/msbuild/slice.vcxproj.filters b/cpp/src/Slice/msbuild/slice.vcxproj.filters index 9f612ab2529..87d2f04a427 100644 --- a/cpp/src/Slice/msbuild/slice.vcxproj.filters +++ b/cpp/src/Slice/msbuild/slice.vcxproj.filters @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <Filter Include="Source Files"> @@ -15,11 +15,6 @@ </Filter> </ItemGroup> <ItemGroup> - <ResourceCompile Include="..\Slice.rc"> - <Filter>Resource Files</Filter> - </ResourceCompile> - </ItemGroup> - <ItemGroup> <ClCompile Include="..\Checksum.cpp"> <Filter>Source Files</Filter> </ClCompile> @@ -131,7 +126,4 @@ <Filter>Header Files</Filter> </ClInclude> </ItemGroup> - <ItemGroup> - <None Include="packages.config" /> - </ItemGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/cpp/src/slice2cpp/msbuild/packages.config b/cpp/src/slice2cpp/msbuild/packages.config new file mode 100644 index 00000000000..88735dc0077 --- /dev/null +++ b/cpp/src/slice2cpp/msbuild/packages.config @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<packages> + <package id="mcpp.v120" version="2.7.2.9" targetFramework="native" /> + <package id="mcpp.v140" version="2.7.2.9" targetFramework="native" /> +</packages>
\ No newline at end of file diff --git a/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj b/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj index 0f33beaa558..fe49979724f 100644 --- a/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj +++ b/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj @@ -63,6 +63,38 @@ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> <ItemGroup> <ClCompile Include="..\Gen.cpp" /> <ClCompile Include="..\Main.cpp" /> @@ -73,7 +105,27 @@ <ItemGroup> <ClInclude Include="..\Gen.h" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\IceUtil\msbuild\iceutil\iceutil.vcxproj"> + <Project>{4d1a5110-3176-44ba-8bbb-57bf56519b9f}</Project> + </ProjectReference> + <ProjectReference Include="..\..\Slice\msbuild\slice.vcxproj"> + <Project>{57cd6ac2-0c9d-4648-9e9d-5df60c90f18a}</Project> + </ProjectReference> + </ItemGroup> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> + <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets')" /> </ImportGroup> -</Project> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> + <PropertyGroup> + <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> + </PropertyGroup> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets'))" /> + </Target> +</Project>
\ No newline at end of file diff --git a/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj.filters b/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj.filters index f1ac54f4fa2..7da0829adee 100644 --- a/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj.filters +++ b/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj.filters @@ -32,4 +32,7 @@ <Filter>Header Files</Filter> </ClInclude> </ItemGroup> -</Project> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/cpp/src/slice2cs/msbuild/packages.config b/cpp/src/slice2cs/msbuild/packages.config new file mode 100644 index 00000000000..88735dc0077 --- /dev/null +++ b/cpp/src/slice2cs/msbuild/packages.config @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<packages> + <package id="mcpp.v120" version="2.7.2.9" targetFramework="native" /> + <package id="mcpp.v140" version="2.7.2.9" targetFramework="native" /> +</packages>
\ No newline at end of file diff --git a/cpp/src/slice2cs/msbuild/slice2cs.vcxproj b/cpp/src/slice2cs/msbuild/slice2cs.vcxproj index dd9f1800f42..8d7ce1afc3f 100644 --- a/cpp/src/slice2cs/msbuild/slice2cs.vcxproj +++ b/cpp/src/slice2cs/msbuild/slice2cs.vcxproj @@ -66,22 +66,38 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> </ItemDefinitionGroup> <ItemGroup> <ClCompile Include="..\Gen.cpp" /> @@ -93,7 +109,27 @@ <ItemGroup> <ClInclude Include="..\Gen.h" /> </ItemGroup> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\IceUtil\msbuild\iceutil\iceutil.vcxproj"> + <Project>{4d1a5110-3176-44ba-8bbb-57bf56519b9f}</Project> + </ProjectReference> + <ProjectReference Include="..\..\Slice\msbuild\slice.vcxproj"> + <Project>{57cd6ac2-0c9d-4648-9e9d-5df60c90f18a}</Project> + </ProjectReference> + </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> + <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets')" /> </ImportGroup> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> + <PropertyGroup> + <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> + </PropertyGroup> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets'))" /> + </Target> </Project>
\ No newline at end of file diff --git a/cpp/src/slice2cs/msbuild/slice2cs.vcxproj.filters b/cpp/src/slice2cs/msbuild/slice2cs.vcxproj.filters index 76563adba5b..8475e9c7071 100644 --- a/cpp/src/slice2cs/msbuild/slice2cs.vcxproj.filters +++ b/cpp/src/slice2cs/msbuild/slice2cs.vcxproj.filters @@ -32,4 +32,7 @@ <Filter>Header Files</Filter> </ClInclude> </ItemGroup> -</Project> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/cpp/src/slice2html/msbuild/packages.config b/cpp/src/slice2html/msbuild/packages.config new file mode 100644 index 00000000000..88735dc0077 --- /dev/null +++ b/cpp/src/slice2html/msbuild/packages.config @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<packages> + <package id="mcpp.v120" version="2.7.2.9" targetFramework="native" /> + <package id="mcpp.v140" version="2.7.2.9" targetFramework="native" /> +</packages>
\ No newline at end of file diff --git a/cpp/src/slice2html/msbuild/slice2html.vcxproj b/cpp/src/slice2html/msbuild/slice2html.vcxproj index 7d41241f4b9..493cdedce11 100644 --- a/cpp/src/slice2html/msbuild/slice2html.vcxproj +++ b/cpp/src/slice2html/msbuild/slice2html.vcxproj @@ -66,22 +66,38 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> </ItemDefinitionGroup> <ItemGroup> <ClCompile Include="..\Gen.cpp" /> @@ -93,7 +109,27 @@ <ItemGroup> <ClInclude Include="..\Gen.h" /> </ItemGroup> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\IceUtil\msbuild\iceutil\iceutil.vcxproj"> + <Project>{4d1a5110-3176-44ba-8bbb-57bf56519b9f}</Project> + </ProjectReference> + <ProjectReference Include="..\..\Slice\msbuild\slice.vcxproj"> + <Project>{57cd6ac2-0c9d-4648-9e9d-5df60c90f18a}</Project> + </ProjectReference> + </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> + <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets')" /> </ImportGroup> -</Project> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> + <PropertyGroup> + <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> + </PropertyGroup> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets'))" /> + </Target> +</Project>
\ No newline at end of file diff --git a/cpp/src/slice2html/msbuild/slice2html.vcxproj.filters b/cpp/src/slice2html/msbuild/slice2html.vcxproj.filters index ace683b23cf..d600de331c4 100644 --- a/cpp/src/slice2html/msbuild/slice2html.vcxproj.filters +++ b/cpp/src/slice2html/msbuild/slice2html.vcxproj.filters @@ -32,4 +32,7 @@ <Filter>Header Files</Filter> </ClInclude> </ItemGroup> -</Project> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/cpp/src/slice2java/msbuild/packages.config b/cpp/src/slice2java/msbuild/packages.config new file mode 100644 index 00000000000..88735dc0077 --- /dev/null +++ b/cpp/src/slice2java/msbuild/packages.config @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<packages> + <package id="mcpp.v120" version="2.7.2.9" targetFramework="native" /> + <package id="mcpp.v140" version="2.7.2.9" targetFramework="native" /> +</packages>
\ No newline at end of file diff --git a/cpp/src/slice2java/msbuild/slice2java.vcxproj b/cpp/src/slice2java/msbuild/slice2java.vcxproj index c6149ed65db..b0e7a00ae80 100644 --- a/cpp/src/slice2java/msbuild/slice2java.vcxproj +++ b/cpp/src/slice2java/msbuild/slice2java.vcxproj @@ -66,22 +66,38 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> </ItemDefinitionGroup> <ItemGroup> <ClCompile Include="..\Gen.cpp" /> @@ -93,7 +109,27 @@ <ItemGroup> <ClInclude Include="..\Gen.h" /> </ItemGroup> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\IceUtil\msbuild\iceutil\iceutil.vcxproj"> + <Project>{4d1a5110-3176-44ba-8bbb-57bf56519b9f}</Project> + </ProjectReference> + <ProjectReference Include="..\..\Slice\msbuild\slice.vcxproj"> + <Project>{57cd6ac2-0c9d-4648-9e9d-5df60c90f18a}</Project> + </ProjectReference> + </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> + <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets')" /> </ImportGroup> -</Project> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> + <PropertyGroup> + <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> + </PropertyGroup> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets'))" /> + </Target> +</Project>
\ No newline at end of file diff --git a/cpp/src/slice2java/msbuild/slice2java.vcxproj.filters b/cpp/src/slice2java/msbuild/slice2java.vcxproj.filters index 48e5f9c9a3a..0651fe8a1f4 100644 --- a/cpp/src/slice2java/msbuild/slice2java.vcxproj.filters +++ b/cpp/src/slice2java/msbuild/slice2java.vcxproj.filters @@ -32,4 +32,7 @@ <Filter>Header Files</Filter> </ClInclude> </ItemGroup> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> </Project>
\ No newline at end of file diff --git a/cpp/src/slice2js/msbuild/packages.config b/cpp/src/slice2js/msbuild/packages.config new file mode 100644 index 00000000000..88735dc0077 --- /dev/null +++ b/cpp/src/slice2js/msbuild/packages.config @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<packages> + <package id="mcpp.v120" version="2.7.2.9" targetFramework="native" /> + <package id="mcpp.v140" version="2.7.2.9" targetFramework="native" /> +</packages>
\ No newline at end of file diff --git a/cpp/src/slice2js/msbuild/slice2js.vcxproj b/cpp/src/slice2js/msbuild/slice2js.vcxproj index e0620640b12..4a1663a1a20 100644 --- a/cpp/src/slice2js/msbuild/slice2js.vcxproj +++ b/cpp/src/slice2js/msbuild/slice2js.vcxproj @@ -65,22 +65,38 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> </ItemDefinitionGroup> <ItemGroup> <ClCompile Include="..\Gen.cpp" /> @@ -94,7 +110,27 @@ <ClInclude Include="..\Gen.h" /> <ClInclude Include="..\JsUtil.h" /> </ItemGroup> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\IceUtil\msbuild\iceutil\iceutil.vcxproj"> + <Project>{4d1a5110-3176-44ba-8bbb-57bf56519b9f}</Project> + </ProjectReference> + <ProjectReference Include="..\..\Slice\msbuild\slice.vcxproj"> + <Project>{57cd6ac2-0c9d-4648-9e9d-5df60c90f18a}</Project> + </ProjectReference> + </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> + <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets')" /> </ImportGroup> -</Project> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> + <PropertyGroup> + <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> + </PropertyGroup> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets'))" /> + </Target> +</Project>
\ No newline at end of file diff --git a/cpp/src/slice2js/msbuild/slice2js.vcxproj.filters b/cpp/src/slice2js/msbuild/slice2js.vcxproj.filters index 67b5955b8b1..20badfb10f7 100644 --- a/cpp/src/slice2js/msbuild/slice2js.vcxproj.filters +++ b/cpp/src/slice2js/msbuild/slice2js.vcxproj.filters @@ -38,4 +38,7 @@ <Filter>Header Files</Filter> </ClInclude> </ItemGroup> -</Project> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/cpp/src/slice2php/msbuild/packages.config b/cpp/src/slice2php/msbuild/packages.config new file mode 100644 index 00000000000..88735dc0077 --- /dev/null +++ b/cpp/src/slice2php/msbuild/packages.config @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<packages> + <package id="mcpp.v120" version="2.7.2.9" targetFramework="native" /> + <package id="mcpp.v140" version="2.7.2.9" targetFramework="native" /> +</packages>
\ No newline at end of file diff --git a/cpp/src/slice2php/msbuild/slice2php.vcxproj b/cpp/src/slice2php/msbuild/slice2php.vcxproj index e56df0b6e16..303363cf4fe 100644 --- a/cpp/src/slice2php/msbuild/slice2php.vcxproj +++ b/cpp/src/slice2php/msbuild/slice2php.vcxproj @@ -63,13 +63,65 @@ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> <ItemGroup> <ClCompile Include="..\Main.cpp" /> </ItemGroup> <ItemGroup> <ResourceCompile Include="..\Slice2PHP.rc" /> </ItemGroup> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\IceUtil\msbuild\iceutil\iceutil.vcxproj"> + <Project>{4d1a5110-3176-44ba-8bbb-57bf56519b9f}</Project> + </ProjectReference> + <ProjectReference Include="..\..\Slice\msbuild\slice.vcxproj"> + <Project>{57cd6ac2-0c9d-4648-9e9d-5df60c90f18a}</Project> + </ProjectReference> + </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> + <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets')" /> </ImportGroup> -</Project> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> + <PropertyGroup> + <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> + </PropertyGroup> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets'))" /> + </Target> +</Project>
\ No newline at end of file diff --git a/cpp/src/slice2php/msbuild/slice2php.vcxproj.filters b/cpp/src/slice2php/msbuild/slice2php.vcxproj.filters index 03614f8fa86..62800ba8a81 100644 --- a/cpp/src/slice2php/msbuild/slice2php.vcxproj.filters +++ b/cpp/src/slice2php/msbuild/slice2php.vcxproj.filters @@ -24,4 +24,7 @@ <Filter>Resource Files</Filter> </ResourceCompile> </ItemGroup> -</Project> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/cpp/src/slice2py/msbuild/packages.config b/cpp/src/slice2py/msbuild/packages.config new file mode 100644 index 00000000000..88735dc0077 --- /dev/null +++ b/cpp/src/slice2py/msbuild/packages.config @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<packages> + <package id="mcpp.v120" version="2.7.2.9" targetFramework="native" /> + <package id="mcpp.v140" version="2.7.2.9" targetFramework="native" /> +</packages>
\ No newline at end of file diff --git a/cpp/src/slice2py/msbuild/slice2py.vcxproj b/cpp/src/slice2py/msbuild/slice2py.vcxproj index ec0c7eb46ea..1777cc1d8fd 100644 --- a/cpp/src/slice2py/msbuild/slice2py.vcxproj +++ b/cpp/src/slice2py/msbuild/slice2py.vcxproj @@ -63,13 +63,65 @@ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> <ItemGroup> <ClCompile Include="..\Main.cpp" /> </ItemGroup> <ItemGroup> <ResourceCompile Include="..\Slice2Py.rc" /> </ItemGroup> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\IceUtil\msbuild\iceutil\iceutil.vcxproj"> + <Project>{4d1a5110-3176-44ba-8bbb-57bf56519b9f}</Project> + </ProjectReference> + <ProjectReference Include="..\..\Slice\msbuild\slice.vcxproj"> + <Project>{57cd6ac2-0c9d-4648-9e9d-5df60c90f18a}</Project> + </ProjectReference> + </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> + <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets')" /> </ImportGroup> -</Project> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> + <PropertyGroup> + <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> + </PropertyGroup> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets'))" /> + </Target> +</Project>
\ No newline at end of file diff --git a/cpp/src/slice2py/msbuild/slice2py.vcxproj.filters b/cpp/src/slice2py/msbuild/slice2py.vcxproj.filters index c7a97272bec..eb750eda368 100644 --- a/cpp/src/slice2py/msbuild/slice2py.vcxproj.filters +++ b/cpp/src/slice2py/msbuild/slice2py.vcxproj.filters @@ -24,4 +24,7 @@ <Filter>Resource Files</Filter> </ResourceCompile> </ItemGroup> -</Project> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> +</Project>
\ No newline at end of file |