Skip to content

Commit 38a674d

Browse files
rogermanrogerman
committed
Windows Port/Interface: Make build files more robust and less prone to breakage for future Visual Studio versions. (Related to commit 39f27d3, 5e006a0, and PR #936.)
1 parent 5e006a0 commit 38a674d

File tree

4 files changed

+16
-34
lines changed

4 files changed

+16
-34
lines changed

‎desmume/src/frontend/interface/windows/DeSmuME_Interface.vcxproj‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,8 @@
5050
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
5151
<!-- desmume customization: set PlatformToolset to an uptodate choice for vs2015 and leave it to the default vs2010 toolset for vs2010 -->
5252
<!-- NOTE: the location of this hack is important or else we break resource editing, intellisense, and ctrl+f7 in vs2010 either; or it doesnt work for vs2015. weird. -->
53-
<PropertyGroup Condition="'$(VisualStudioVersion)' == '18.0'" Label="Configuration">
54-
<PlatformToolset>v145</PlatformToolset>
55-
</PropertyGroup>
56-
<PropertyGroup Condition="'$(VisualStudioVersion)' == '17.0'" Label="Configuration">
57-
<PlatformToolset>v143</PlatformToolset>
58-
</PropertyGroup>
59-
<PropertyGroup Condition="'$(VisualStudioVersion)' == '16.0'" Label="Configuration">
60-
<PlatformToolset>v142</PlatformToolset>
53+
<PropertyGroup Condition="'$(VisualStudioVersion)' &gt;= '16.0'" Label="Configuration">
54+
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
6155
</PropertyGroup>
6256
<PropertyGroup Condition="'$(VisualStudioVersion)' == '15.0'" Label="Configuration">
6357
<PlatformToolset>v141_xp</PlatformToolset>

‎desmume/src/frontend/interface/windows/desmume.props‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,12 @@
1414
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
1515
</PropertyGroup>
1616

17-
<!-- reformat version to be more useful -->
17+
<!-- reformat version to be more safe -->
1818
<PropertyGroup>
1919
<NDS_VSVER Condition="'$(VisualStudioVersion)' == '10.0'">10</NDS_VSVER>
20-
<NDS_VSVER Condition="'$(VisualStudioVersion)' == '11.0'">11</NDS_VSVER>
21-
<NDS_VSVER Condition="'$(VisualStudioVersion)' == '12.0'">12</NDS_VSVER>
22-
<NDS_VSVER Condition="'$(VisualStudioVersion)' == '14.0'">14</NDS_VSVER>
23-
<NDS_VSVER Condition="'$(VisualStudioVersion)' == '15.0'">15</NDS_VSVER>
24-
<NDS_VSVER Condition="'$(VisualStudioVersion)' == '16.0'">16</NDS_VSVER>
25-
<NDS_VSVER Condition="'$(VisualStudioVersion)' == '17.0'">17</NDS_VSVER>
26-
<NDS_VSVER Condition="'$(VisualStudioVersion)' == '18.0'">18</NDS_VSVER>
27-
<!-- others may not be supported, so lets not list them here -->
20+
<!-- Doesn't work on 2010 -->
21+
<NDS_VSVER Condition="'$(VisualStudioVersion)' &gt;= '11.0'">$(VisualStudioVersion.Split('.')[0])</NDS_VSVER>
22+
2823
<NDS_VisualStudioName Condition="'$(NDS_VSVER)' == '10'">VS2010</NDS_VisualStudioName>
2924
<NDS_VisualStudioName Condition="'$(NDS_VSVER)' == '11'">VS2012</NDS_VisualStudioName>
3025
<NDS_VisualStudioName Condition="'$(NDS_VSVER)' == '12'">VS2013</NDS_VisualStudioName>
@@ -33,6 +28,8 @@
3328
<NDS_VisualStudioName Condition="'$(NDS_VSVER)' == '16'">VS2019</NDS_VisualStudioName>
3429
<NDS_VisualStudioName Condition="'$(NDS_VSVER)' == '17'">VS2022</NDS_VisualStudioName>
3530
<NDS_VisualStudioName Condition="'$(NDS_VSVER)' == '18'">VS2026</NDS_VisualStudioName>
31+
<!-- Update when next version releases -->
32+
<NDS_VisualStudioName Condition="'$(NDS_VSVER)' &gt; '18'">VS_Unknown</NDS_VisualStudioName>
3633
</PropertyGroup>
3734

3835
<!-- Generate optimization level property from configuration name -->

‎desmume/src/frontend/windows/DeSmuME.vcxproj‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,8 @@
3333
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3434
<!-- desmume customization: set PlatformToolset to an uptodate choice for vs2015 and leave it to the default vs2010 toolset for vs2010 -->
3535
<!-- NOTE: the location of this hack is important or else we break resource editing, intellisense, and ctrl+f7 in vs2010 either; or it doesnt work for vs2015. weird. -->
36-
<PropertyGroup Condition="'$(VisualStudioVersion)' == '18.0'" Label="Configuration">
37-
<PlatformToolset>v145</PlatformToolset>
38-
</PropertyGroup>
39-
<PropertyGroup Condition="'$(VisualStudioVersion)' == '17.0'" Label="Configuration">
40-
<PlatformToolset>v143</PlatformToolset>
41-
</PropertyGroup>
42-
<PropertyGroup Condition="'$(VisualStudioVersion)' == '16.0'" Label="Configuration">
43-
<PlatformToolset>v142</PlatformToolset>
36+
<PropertyGroup Condition="'$(VisualStudioVersion)' &gt;= '16.0'" Label="Configuration">
37+
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
4438
</PropertyGroup>
4539
<PropertyGroup Condition="'$(VisualStudioVersion)' == '15.0'" Label="Configuration">
4640
<PlatformToolset>v141_xp</PlatformToolset>

‎desmume/src/frontend/windows/desmume.props‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,12 @@
1414
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
1515
</PropertyGroup>
1616

17-
<!-- reformat version to be more useful -->
17+
<!-- reformat version to be more safe -->
1818
<PropertyGroup>
1919
<NDS_VSVER Condition="'$(VisualStudioVersion)' == '10.0'">10</NDS_VSVER>
20-
<NDS_VSVER Condition="'$(VisualStudioVersion)' == '11.0'">11</NDS_VSVER>
21-
<NDS_VSVER Condition="'$(VisualStudioVersion)' == '12.0'">12</NDS_VSVER>
22-
<NDS_VSVER Condition="'$(VisualStudioVersion)' == '14.0'">14</NDS_VSVER>
23-
<NDS_VSVER Condition="'$(VisualStudioVersion)' == '15.0'">15</NDS_VSVER>
24-
<NDS_VSVER Condition="'$(VisualStudioVersion)' == '16.0'">16</NDS_VSVER>
25-
<NDS_VSVER Condition="'$(VisualStudioVersion)' == '17.0'">17</NDS_VSVER>
26-
<NDS_VSVER Condition="'$(VisualStudioVersion)' == '18.0'">18</NDS_VSVER>
27-
<!-- others may not be supported, so lets not list them here -->
20+
<!-- Doesn't work on 2010 -->
21+
<NDS_VSVER Condition="'$(VisualStudioVersion)' &gt;= '11.0'">$(VisualStudioVersion.Split('.')[0])</NDS_VSVER>
22+
2823
<NDS_VisualStudioName Condition="'$(NDS_VSVER)' == '10'">VS2010</NDS_VisualStudioName>
2924
<NDS_VisualStudioName Condition="'$(NDS_VSVER)' == '11'">VS2012</NDS_VisualStudioName>
3025
<NDS_VisualStudioName Condition="'$(NDS_VSVER)' == '12'">VS2013</NDS_VisualStudioName>
@@ -33,6 +28,8 @@
3328
<NDS_VisualStudioName Condition="'$(NDS_VSVER)' == '16'">VS2019</NDS_VisualStudioName>
3429
<NDS_VisualStudioName Condition="'$(NDS_VSVER)' == '17'">VS2022</NDS_VisualStudioName>
3530
<NDS_VisualStudioName Condition="'$(NDS_VSVER)' == '18'">VS2026</NDS_VisualStudioName>
31+
<!-- Update when next version releases -->
32+
<NDS_VisualStudioName Condition="'$(NDS_VSVER)' &gt; '18'">VS_Unknown</NDS_VisualStudioName>
3633
</PropertyGroup>
3734

3835
<!-- Generate optimization level property from configuration name -->

0 commit comments

Comments
 (0)