Skip to content

Commit 4b55def

Browse files
authored
Merge pull request #211 from q4a/xd_dev
Update WindowsTargetPlatformVersion and LanguageStandard for vcxproj
2 parents abc6500 + 2b80c0b commit 4b55def

File tree

47 files changed

+200
-30
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+200
-30
lines changed

Externals/ODE.vcxproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
<PropertyGroup Label="Globals">
3030
<ProjectName>ODE</ProjectName>
3131
<ProjectGuid>{1BF75FEB-87DD-486C-880B-227987D191C2}</ProjectGuid>
32-
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
3332
</PropertyGroup>
3433
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3534
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'" Label="Configuration">

Externals/luabind.vcxproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
</ItemGroup>
2929
<PropertyGroup Label="Globals">
3030
<ProjectGuid>{CCD4AFAE-AA10-42C6-A452-FDEE497CCDF1}</ProjectGuid>
31-
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
3231
</PropertyGroup>
3332
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3433
<PropertyGroup Label="Configuration">

src/Common/Common.vcxproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
<PropertyGroup Label="Globals">
2222
<ProjectGuid>{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}</ProjectGuid>
2323
<RootNamespace>Common</RootNamespace>
24-
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
2524
</PropertyGroup>
2625
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2726
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -105,6 +104,11 @@
105104
<PreLinkEventUseInBuild>false</PreLinkEventUseInBuild>
106105
<PostBuildEventUseInBuild>false</PostBuildEventUseInBuild>
107106
</PropertyGroup>
107+
<ItemDefinitionGroup>
108+
<ClCompile>
109+
<LanguageStandard>stdcpp17</LanguageStandard>
110+
</ClCompile>
111+
</ItemDefinitionGroup>
108112
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
109113
<ClCompile>
110114
<WarningLevel>Level3</WarningLevel>

src/Layers/xrAPI/xrAPI.vcxproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
<ProjectGuid>{1DAEC516-E52C-4A3C-A4DA-AE3553E6E0F8}</ProjectGuid>
3131
<RootNamespace>xrAPI</RootNamespace>
3232
<Keyword>Win32Proj</Keyword>
33-
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
3433
</PropertyGroup>
3534
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3635
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -96,6 +95,11 @@
9695
<PropertyGroup>
9796
<_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
9897
</PropertyGroup>
98+
<ItemDefinitionGroup>
99+
<ClCompile>
100+
<LanguageStandard>stdcpp17</LanguageStandard>
101+
</ClCompile>
102+
</ItemDefinitionGroup>
99103
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
100104
<ClCompile>
101105
<PreprocessorDefinitions>_USRDLL;XRAPI_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/Layers/xrRenderPC_GL/xrRender_GL.vcxproj

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,11 @@
7575
<PropertyGroup>
7676
<_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
7777
</PropertyGroup>
78+
<ItemDefinitionGroup>
79+
<ClCompile>
80+
<LanguageStandard>stdcpp17</LanguageStandard>
81+
</ClCompile>
82+
</ItemDefinitionGroup>
7883
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
7984
<ClCompile>
8085
<AdditionalIncludeDirectories>$(xrExternals)OpenAutomate\inc;$(xrExternals)gl\include;$(xrExternals)glew\include;$(xrExternals)gli;$(xrExternals)gli\external\glm;$(xrExternals)AGS_SDK;$(xrExternals)glslang\glslang\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

src/Layers/xrRenderPC_R1/xrRender_R1.vcxproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
<ProjectGuid>{57A498C9-A741-4DDF-8EFC-BFB9EB6B00E2}</ProjectGuid>
3131
<RootNamespace>xrRender_R1</RootNamespace>
3232
<Keyword>Win32Proj</Keyword>
33-
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
3433
</PropertyGroup>
3534
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3635
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'" Label="Configuration">
@@ -96,6 +95,11 @@
9695
<PropertyGroup>
9796
<_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
9897
</PropertyGroup>
98+
<ItemDefinitionGroup>
99+
<ClCompile>
100+
<LanguageStandard>stdcpp17</LanguageStandard>
101+
</ClCompile>
102+
</ItemDefinitionGroup>
99103
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
100104
<ClCompile>
101105
<AdditionalIncludeDirectories>$(xrExternals)OpenAutomate\inc;$(xrExternals)nvapi;$(xrExternals)AGS_SDK;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

src/Layers/xrRenderPC_R2/xrRender_R2.vcxproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
<ProjectGuid>{963BA4E5-499A-454D-B002-1D5ECE0527A6}</ProjectGuid>
3131
<RootNamespace>xrRender_R2</RootNamespace>
3232
<Keyword>Win32Proj</Keyword>
33-
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
3433
</PropertyGroup>
3534
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3635
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'" Label="Configuration">
@@ -96,6 +95,11 @@
9695
<PropertyGroup>
9796
<_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
9897
</PropertyGroup>
98+
<ItemDefinitionGroup>
99+
<ClCompile>
100+
<LanguageStandard>stdcpp17</LanguageStandard>
101+
</ClCompile>
102+
</ItemDefinitionGroup>
99103
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
100104
<ClCompile>
101105
<AdditionalIncludeDirectories>$(xrExternals)OpenAutomate\inc;$(xrExternals)nvapi;$(xrExternals)AGS_SDK;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

src/Layers/xrRenderPC_R3/xrRender_R3.vcxproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
<ProjectGuid>{3F383D3C-FCD8-4170-990B-EB4833F09248}</ProjectGuid>
3131
<RootNamespace>xrRender_R3</RootNamespace>
3232
<Keyword>Win32Proj</Keyword>
33-
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
3433
</PropertyGroup>
3534
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3635
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'" Label="Configuration">
@@ -96,6 +95,11 @@
9695
<PropertyGroup>
9796
<_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
9897
</PropertyGroup>
98+
<ItemDefinitionGroup>
99+
<ClCompile>
100+
<LanguageStandard>stdcpp17</LanguageStandard>
101+
</ClCompile>
102+
</ItemDefinitionGroup>
99103
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
100104
<ClCompile>
101105
<AdditionalIncludeDirectories>$(xrExternals)OpenAutomate\inc;$(xrExternals)nvapi;$(xrExternals)AGS_SDK;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

src/Layers/xrRenderPC_R4/xrRender_R4.vcxproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
<ProjectGuid>{AC9B12ED-A2D7-4337-A981-5BD8430E96D8}</ProjectGuid>
3131
<RootNamespace>xrRender_R4</RootNamespace>
3232
<Keyword>Win32Proj</Keyword>
33-
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
3433
</PropertyGroup>
3534
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3635
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'" Label="Configuration">
@@ -96,6 +95,11 @@
9695
<PropertyGroup>
9796
<_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
9897
</PropertyGroup>
98+
<ItemDefinitionGroup>
99+
<ClCompile>
100+
<LanguageStandard>stdcpp17</LanguageStandard>
101+
</ClCompile>
102+
</ItemDefinitionGroup>
99103
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
100104
<ClCompile>
101105
<AdditionalIncludeDirectories>$(xrExternals)OpenAutomate\inc;$(xrExternals)nvapi;$(xrExternals)AGS_SDK;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

src/dummy/dummy.vcxproj

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,11 @@
6363
<PropertyGroup>
6464
<OutDir>$(xrIntDir)</OutDir>
6565
</PropertyGroup>
66+
<ItemDefinitionGroup>
67+
<ClCompile>
68+
<LanguageStandard>stdcpp17</LanguageStandard>
69+
</ClCompile>
70+
</ItemDefinitionGroup>
6671
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
6772
<ClCompile>
6873
<WarningLevel>TurnOffAllWarnings</WarningLevel>

0 commit comments

Comments
 (0)