diff options
| author | Austin Henriksen <austin@zeroc.com> | 2021-02-03 18:11:49 -0500 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2021-02-09 13:15:43 -0500 |
| commit | 24f320be8cfd21c1c5710e4590bb53561b72fdb5 (patch) | |
| tree | 2a8e52388c4f9e35a4d01b9f3075393b98986468 /cpp/src | |
| parent | Regenerated IceStorm scanner. (diff) | |
| download | ice-24f320be8cfd21c1c5710e4590bb53561b72fdb5.tar.bz2 ice-24f320be8cfd21c1c5710e4590bb53561b72fdb5.tar.xz ice-24f320be8cfd21c1c5710e4590bb53561b72fdb5.zip | |
Repaired VS project and solution files.
Diffstat (limited to 'cpp/src')
13 files changed, 15 insertions, 12 deletions
diff --git a/cpp/src/Glacier2/msbuild/glacier2router.vcxproj b/cpp/src/Glacier2/msbuild/glacier2router.vcxproj index 03baefb49f0..afe34b9dc63 100644 --- a/cpp/src/Glacier2/msbuild/glacier2router.vcxproj +++ b/cpp/src/Glacier2/msbuild/glacier2router.vcxproj @@ -44,7 +44,7 @@ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <Import Project="$(MSBuildThisFileDirectory)\..\..\..\msbuild\ice.cpp98.props" /> + <Import Project="$(MSBuildThisFileDirectory)\..\..\..\msbuild\ice.cpp11.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> diff --git a/cpp/src/IceBox/msbuild/iceboxadmin/iceboxadmin.vcxproj b/cpp/src/IceBox/msbuild/iceboxadmin/iceboxadmin.vcxproj index 7b6a1069efd..5154cf78e28 100644 --- a/cpp/src/IceBox/msbuild/iceboxadmin/iceboxadmin.vcxproj +++ b/cpp/src/IceBox/msbuild/iceboxadmin/iceboxadmin.vcxproj @@ -47,7 +47,7 @@ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp98.props" /> + <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp11.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> diff --git a/cpp/src/IceBridge/msbuild/icebridge.vcxproj b/cpp/src/IceBridge/msbuild/icebridge.vcxproj index 29e41b1812c..471bee3db07 100644 --- a/cpp/src/IceBridge/msbuild/icebridge.vcxproj +++ b/cpp/src/IceBridge/msbuild/icebridge.vcxproj @@ -44,7 +44,7 @@ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <Import Project="$(MSBuildThisFileDirectory)\..\..\..\msbuild\ice.cpp98.props" /> + <Import Project="$(MSBuildThisFileDirectory)\..\..\..\msbuild\ice.cpp11.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> diff --git a/cpp/src/IceDB/msbuild/icedb.vcxproj b/cpp/src/IceDB/msbuild/icedb.vcxproj index 0bc68a1bfe1..00450091156 100644 --- a/cpp/src/IceDB/msbuild/icedb.vcxproj +++ b/cpp/src/IceDB/msbuild/icedb.vcxproj @@ -45,7 +45,7 @@ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <Import Project="$(MSBuildThisFileDirectory)\..\..\..\msbuild\ice.cpp98.props" /> + <Import Project="$(MSBuildThisFileDirectory)\..\..\..\msbuild\ice.cpp11.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> diff --git a/cpp/src/IceGrid/Scanner.cpp b/cpp/src/IceGrid/Scanner.cpp index 23958d4a7c9..9413d50a829 100644 --- a/cpp/src/IceGrid/Scanner.cpp +++ b/cpp/src/IceGrid/Scanner.cpp @@ -471,6 +471,7 @@ using namespace IceGrid; # undef yywrap # define yywrap() 1 # endif +# define YY_NO_UNISTD_H #endif #define YY_INPUT(buf, result, maxSize) parser->getInput(buf, result, maxSize) diff --git a/cpp/src/IceGrid/msbuild/icegridadmin/icegridadmin.vcxproj b/cpp/src/IceGrid/msbuild/icegridadmin/icegridadmin.vcxproj index 75df18d0cc6..f623b5763f7 100644 --- a/cpp/src/IceGrid/msbuild/icegridadmin/icegridadmin.vcxproj +++ b/cpp/src/IceGrid/msbuild/icegridadmin/icegridadmin.vcxproj @@ -44,7 +44,7 @@ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp98.props" /> + <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp11.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> diff --git a/cpp/src/IceGrid/msbuild/icegridnode/icegridnode.vcxproj b/cpp/src/IceGrid/msbuild/icegridnode/icegridnode.vcxproj index f33c1c1dc37..7d05d27eec4 100644 --- a/cpp/src/IceGrid/msbuild/icegridnode/icegridnode.vcxproj +++ b/cpp/src/IceGrid/msbuild/icegridnode/icegridnode.vcxproj @@ -44,7 +44,7 @@ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp98.props" /> + <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp11.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> diff --git a/cpp/src/IceGrid/msbuild/icegridregistry/icegridregistry.vcxproj b/cpp/src/IceGrid/msbuild/icegridregistry/icegridregistry.vcxproj index 9889b74db1c..7097a24b00e 100644 --- a/cpp/src/IceGrid/msbuild/icegridregistry/icegridregistry.vcxproj +++ b/cpp/src/IceGrid/msbuild/icegridregistry/icegridregistry.vcxproj @@ -44,7 +44,7 @@ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp98.props" /> + <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp11.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> diff --git a/cpp/src/IceStorm/msbuild/icestormadmin/icestormadmin.vcxproj b/cpp/src/IceStorm/msbuild/icestormadmin/icestormadmin.vcxproj index 97c2b8bd68b..53b4d096543 100644 --- a/cpp/src/IceStorm/msbuild/icestormadmin/icestormadmin.vcxproj +++ b/cpp/src/IceStorm/msbuild/icestormadmin/icestormadmin.vcxproj @@ -44,7 +44,7 @@ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp98.props" /> + <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp11.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> diff --git a/cpp/src/IceStorm/msbuild/icestormdb/icestormdb.vcxproj b/cpp/src/IceStorm/msbuild/icestormdb/icestormdb.vcxproj index 445cdfccca1..b1e066fa2c7 100644 --- a/cpp/src/IceStorm/msbuild/icestormdb/icestormdb.vcxproj +++ b/cpp/src/IceStorm/msbuild/icestormdb/icestormdb.vcxproj @@ -44,7 +44,7 @@ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp98.props" /> + <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp11.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> diff --git a/cpp/src/IceStorm/msbuild/icestormservice/icestormservice.vcxproj b/cpp/src/IceStorm/msbuild/icestormservice/icestormservice.vcxproj index 9f699aa6f25..a69d578400b 100644 --- a/cpp/src/IceStorm/msbuild/icestormservice/icestormservice.vcxproj +++ b/cpp/src/IceStorm/msbuild/icestormservice/icestormservice.vcxproj @@ -22,6 +22,7 @@ <PropertyGroup Label="Globals"> <ProjectGuid>{9E13C4B5-5DA9-43C1-9304-AEAC035E854D}</ProjectGuid> <RootNamespace>IceStorm</RootNamespace> + <ProjectName>icestormservice++11</ProjectName> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -45,7 +46,7 @@ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp98.props" /> + <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp11.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> diff --git a/cpp/src/IceXML/msbuild/icexml.vcxproj b/cpp/src/IceXML/msbuild/icexml.vcxproj index 473e84d52d5..123ca426a53 100644 --- a/cpp/src/IceXML/msbuild/icexml.vcxproj +++ b/cpp/src/IceXML/msbuild/icexml.vcxproj @@ -21,6 +21,7 @@ <PropertyGroup Label="Globals"> <ProjectGuid>{90EC26E8-AFFA-4E44-B068-AB5849A96FDD}</ProjectGuid> <RootNamespace>IceXML</RootNamespace> + <ProjectName>icexml++11</ProjectName> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -44,7 +45,7 @@ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <Import Project="$(MSBuildThisFileDirectory)\..\..\..\msbuild\ice.cpp98.props" /> + <Import Project="$(MSBuildThisFileDirectory)\..\..\..\msbuild\ice.cpp11.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> diff --git a/cpp/src/icegriddb/msbuild/icegriddb.vcxproj b/cpp/src/icegriddb/msbuild/icegriddb.vcxproj index c3aa4e09696..25d8cdb70ce 100644 --- a/cpp/src/icegriddb/msbuild/icegriddb.vcxproj +++ b/cpp/src/icegriddb/msbuild/icegriddb.vcxproj @@ -44,7 +44,7 @@ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <Import Project="$(MSBuildThisFileDirectory)\..\..\..\msbuild\ice.cpp98.props" /> + <Import Project="$(MSBuildThisFileDirectory)\..\..\..\msbuild\ice.cpp11.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> |