Skip to content

Commit db1f12f

Browse files
committed
Changes to VS 2022
The latest version of the Windows SDK when used with v143 of the Platform Toolset gives an error when compiling for Release x64. This change moves that particular build back to toolset v142 to avoid the bug. I expect this will only be temporary.
1 parent 56368f9 commit db1f12f

File tree

7 files changed

+21
-12
lines changed

7 files changed

+21
-12
lines changed

engine/compilers/VisualStudio 2022/Torque 2D.sln

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio Version 16
3-
VisualStudioVersion = 16.0.31729.503
2+
# Visual Studio Version 17
3+
VisualStudioVersion = 17.5.33530.505
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Torque2D", "Torque 2D.vcxproj", "{1564A07D-230E-4C90-AEE6-52AC9A58D6C9}"
66
ProjectSection(ProjectDependencies) = postProject
7-
{3A214E06-B95E-4D61-A291-1F8DF2EC10FD} = {3A214E06-B95E-4D61-A291-1F8DF2EC10FD}
87
{15CBFEFF-7965-41F5-B4E2-21E8795C9159} = {15CBFEFF-7965-41F5-B4E2-21E8795C9159}
8+
{3A214E06-B95E-4D61-A291-1F8DF2EC10FD} = {3A214E06-B95E-4D61-A291-1F8DF2EC10FD}
99
EndProjectSection
1010
EndProject
1111
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ljpeg", "ljpeg.vcxproj", "{0B07BA94-AA53-4FD4-ADB4-79EC2DA53B36}"
@@ -17,9 +17,6 @@ EndProject
1717
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libogg", "libogg.vcxproj", "{15CBFEFF-7965-41F5-B4E2-21E8795C9159}"
1818
EndProject
1919
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvorbis", "libvorbis.vcxproj", "{3A214E06-B95E-4D61-A291-1F8DF2EC10FD}"
20-
ProjectSection(ProjectDependencies) = postProject
21-
{15CBFEFF-7965-41F5-B4E2-21E8795C9159} = {15CBFEFF-7965-41F5-B4E2-21E8795C9159}
22-
EndProjectSection
2320
EndProject
2421
Global
2522
GlobalSection(SolutionConfigurationPlatforms) = preSolution

engine/compilers/VisualStudio 2022/Torque 2D.vcxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4242
<ConfigurationType>Application</ConfigurationType>
4343
<UseOfMfc>false</UseOfMfc>
44-
<PlatformToolset>v143</PlatformToolset>
44+
<PlatformToolset>v142</PlatformToolset>
4545
</PropertyGroup>
4646
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Shipping|Win32'" Label="Configuration">
4747
<ConfigurationType>Application</ConfigurationType>

engine/compilers/VisualStudio 2022/libogg.vcxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<ConfigurationType>StaticLibrary</ConfigurationType>
4949
<CharacterSet>Unicode</CharacterSet>
5050
<WholeProgramOptimization>true</WholeProgramOptimization>
51-
<PlatformToolset>v143</PlatformToolset>
51+
<PlatformToolset>v142</PlatformToolset>
5252
</PropertyGroup>
5353
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
5454
<ConfigurationType>StaticLibrary</ConfigurationType>

engine/compilers/VisualStudio 2022/libvorbis.vcxproj

+13-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<ConfigurationType>StaticLibrary</ConfigurationType>
4141
<CharacterSet>Unicode</CharacterSet>
4242
<WholeProgramOptimization>true</WholeProgramOptimization>
43-
<PlatformToolset>v143</PlatformToolset>
43+
<PlatformToolset>v142</PlatformToolset>
4444
</PropertyGroup>
4545
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4646
<ConfigurationType>StaticLibrary</ConfigurationType>
@@ -154,6 +154,10 @@
154154
<ObjectFileName>.\../../Link/Release/libvorbis/</ObjectFileName>
155155
<ProgramDataBaseFileName>.\../../Link/Release/libvorbis/</ProgramDataBaseFileName>
156156
</ClCompile>
157+
<Lib>
158+
<LinkTimeCodeGeneration>
159+
</LinkTimeCodeGeneration>
160+
</Lib>
157161
</ItemDefinitionGroup>
158162
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
159163
<Midl>
@@ -179,6 +183,9 @@
179183
<DisableSpecificWarnings>4244;4100;4267;4189;4305;4127;4706;%(DisableSpecificWarnings)</DisableSpecificWarnings>
180184
<CallingConvention>Cdecl</CallingConvention>
181185
</ClCompile>
186+
<Lib>
187+
<LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
188+
</Lib>
182189
</ItemDefinitionGroup>
183190
<ItemGroup>
184191
<ClCompile Include="..\..\Lib\libvorbis\analysis.c" />
@@ -248,6 +255,11 @@
248255
<ClInclude Include="..\..\Lib\libvorbis\include\vorbis\vorbisfile.h" />
249256
<ClInclude Include="..\..\Lib\libvorbis\window.h" />
250257
</ItemGroup>
258+
<ItemGroup>
259+
<ProjectReference Include="libogg.vcxproj">
260+
<Project>{15cbfeff-7965-41f5-b4e2-21e8795c9159}</Project>
261+
</ProjectReference>
262+
</ItemGroup>
251263
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
252264
<ImportGroup Label="ExtensionTargets">
253265
</ImportGroup>

engine/compilers/VisualStudio 2022/ljpeg.vcxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
5050
<ConfigurationType>StaticLibrary</ConfigurationType>
5151
<UseOfMfc>false</UseOfMfc>
52-
<PlatformToolset>v143</PlatformToolset>
52+
<PlatformToolset>v142</PlatformToolset>
5353
</PropertyGroup>
5454
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Shipping|Win32'" Label="Configuration">
5555
<ConfigurationType>StaticLibrary</ConfigurationType>

engine/compilers/VisualStudio 2022/lpng.vcxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4040
<ConfigurationType>StaticLibrary</ConfigurationType>
4141
<UseOfMfc>false</UseOfMfc>
42-
<PlatformToolset>v143</PlatformToolset>
42+
<PlatformToolset>v142</PlatformToolset>
4343
</PropertyGroup>
4444
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Shipping|Win32'" Label="Configuration">
4545
<ConfigurationType>StaticLibrary</ConfigurationType>

engine/compilers/VisualStudio 2022/zlib.vcxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
7070
<ConfigurationType>StaticLibrary</ConfigurationType>
7171
<UseOfMfc>false</UseOfMfc>
72-
<PlatformToolset>v143</PlatformToolset>
72+
<PlatformToolset>v142</PlatformToolset>
7373
</PropertyGroup>
7474
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Shipping|Win32'" Label="Configuration">
7575
<ConfigurationType>StaticLibrary</ConfigurationType>

0 commit comments

Comments
 (0)