Skip to content

Commit

Permalink
Retarget Windows SDK for Visual Studio projects
Browse files Browse the repository at this point in the history
  • Loading branch information
@NQNStudios @CelticMinstrel
NQNStudios authored and CelticMinstrel committed Feb 27, 2025
1 parent b200dc2 commit c061ed4
Show file tree
Hide file tree
Showing 12 changed files with 73 additions and 49 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
]
},
win-vs32: {
runs-on: windows-2019,
runs-on: windows-2022,
env: {
VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
},
Expand Down Expand Up @@ -92,7 +92,7 @@
]
},
win-vs64: {
runs-on: windows-2019,
runs-on: windows-2022,
env: {
VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
},
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ proj/xc*/*.xcodeproj/*.pbxuser

# Visual Studio Junk Files
proj/vs*/*sdf
proj/vs*/*.user
proj/vs*/*/*.user
proj/vs*/*.suo
proj/vs*/*.aps
Expand All @@ -56,6 +57,8 @@ proj/vs*/.vs
proj/vs*/.vs
proj/vs*/packages/
proj/vs*/vcpkg_installed/
# Windows debugging symbols
*.pdb

# SCons junk files
.sconsign.dblite
Expand Down
12 changes: 6 additions & 6 deletions proj/vs2017/Blades of Exile.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,30 +22,30 @@
<VCProjectVersion>15.0</VCProjectVersion>
<ProjectGuid>{0D5452F7-8D4E-4406-8FD9-AEE0ED779189}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
<DefineConstants>$(DefineConstants);GIT_REVISION = $(GitCommit); GIT_TAG = $(GitTag); GIT_TAG_REVISION = "no-tag-rev"</DefineConstants>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Expand Down Expand Up @@ -218,4 +218,4 @@
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets" />
</Project>
</Project>
6 changes: 6 additions & 0 deletions proj/vs2017/Blades of Exile.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@
<ClCompile Include="..\..\src\pcedit\pc.editors.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\game\boe.ui.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\game\boe.actions.hpp">
Expand Down Expand Up @@ -143,6 +146,9 @@
<ClInclude Include="..\..\src\pcedit\pc.editors.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\game\boe.ui.hpp">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Image Include="..\..\rsrc\icons\win\BOE Icon.ico">
Expand Down
12 changes: 6 additions & 6 deletions proj/vs2017/Character Editor/Character Editor.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,32 +22,32 @@
<VCProjectVersion>15.0</VCProjectVersion>
<ProjectGuid>{FCABADE2-4EEE-48C3-B0AE-49331A9D9A47}</ProjectGuid>
<RootNamespace>CharacterEditor</RootNamespace>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
Expand Down Expand Up @@ -184,4 +184,4 @@
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets" />
</Project>
</Project>
12 changes: 6 additions & 6 deletions proj/vs2017/Common/Common.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,33 +22,33 @@
<VCProjectVersion>15.0</VCProjectVersion>
<ProjectGuid>{540A4D47-DB2C-40E1-9E10-9F6425377022}</ProjectGuid>
<RootNamespace>Common</RootNamespace>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
<DefineConstants>$(DefineConstants);GIT_REVISION = $(GitCommit); GIT_TAG = $(GitTag); GIT_TAG_REVISION = "no-tag-rev"</DefineConstants>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
Expand Down Expand Up @@ -599,4 +599,4 @@
</Copy>
<Message Text="changed:@(ChangedScenarios)" Importance="high" />
</Target>
</Project>
</Project>
22 changes: 11 additions & 11 deletions proj/vs2017/Common/Common.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -584,9 +584,6 @@
<ClCompile Include="..\..\..\src\fileio\gzstream\gzstream.cpp">
<Filter>FileIO\GZStream</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\fileio\resmgr\restypes.cpp">
<Filter>FileIO\ResMgr</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\fileio\xml-parser\ticpp.cpp">
<Filter>FileIO\TinyXML</Filter>
</ClCompile>
Expand Down Expand Up @@ -635,9 +632,6 @@
<ClCompile Include="..\..\..\src\gfx\gfxsheets.cpp">
<Filter>Gfx</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\gfx\qdpict.mac.cpp">
<Filter>Gfx</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\gfx\render_image.cpp">
<Filter>Gfx</Filter>
</ClCompile>
Expand Down Expand Up @@ -787,6 +781,15 @@
<ClCompile Include="..\..\..\src\dialogxml\widgets\stack.cpp">
<Filter>DialogXML\Widgets</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\fileio\resmgr\res_cursor.cpp" />
<ClCompile Include="..\..\..\src\fileio\resmgr\res_dialog.cpp" />
<ClCompile Include="..\..\..\src\fileio\resmgr\res_font.cpp" />
<ClCompile Include="..\..\..\src\fileio\resmgr\res_image.cpp" />
<ClCompile Include="..\..\..\src\fileio\resmgr\res_sound.cpp" />
<ClCompile Include="..\..\..\src\fileio\resmgr\res_strings.cpp" />
<ClCompile Include="..\..\..\src\tools\drawable_manager.cpp" />
<ClCompile Include="..\..\..\src\tools\framerate_limiter.cpp" />
<ClCompile Include="..\..\..\src\tools\replay.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\src\scenario\town_import.tpp">
Expand Down Expand Up @@ -912,9 +915,6 @@
<ClInclude Include="..\..\..\src\scenario\vehicle.hpp">
<Filter>Scenario</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\tools\cli.hpp">
<Filter>Tools</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\tools\cursors.hpp">
<Filter>Tools</Filter>
</ClInclude>
Expand Down Expand Up @@ -959,7 +959,6 @@
</ClInclude>
<ClInclude Include="..\..\..\src\alchemy.hpp" />
<ClInclude Include="..\..\..\src\damage.hpp" />
<ClInclude Include="..\..\..\src\enchant.hpp" />
<ClInclude Include="..\..\..\src\fields.hpp" />
<ClInclude Include="..\..\..\src\global.hpp" />
<ClInclude Include="..\..\..\src\location.hpp" />
Expand Down Expand Up @@ -1032,5 +1031,6 @@
<ClInclude Include="..\..\..\src\dialogxml\widgets\stack.hpp">
<Filter>DialogXML\Widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\tools\replay.hpp" />
</ItemGroup>
</Project>
</Project>
10 changes: 5 additions & 5 deletions proj/vs2017/Installer/Installer.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,32 +22,32 @@
<VCProjectVersion>15.0</VCProjectVersion>
<ProjectGuid>{51EE3F8F-C1D2-4CE8-858C-EA06473F535E}</ProjectGuid>
<RootNamespace>Installer</RootNamespace>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
Expand Down
12 changes: 6 additions & 6 deletions proj/vs2017/Scenario Editor/Scenario Editor.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,32 +22,32 @@
<VCProjectVersion>15.0</VCProjectVersion>
<ProjectGuid>{16A4B43F-956A-4B9D-9912-A77CBDDD0F4E}</ProjectGuid>
<RootNamespace>ScenarioEditor</RootNamespace>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
Expand Down Expand Up @@ -195,4 +195,4 @@
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets" />
</Project>
</Project>
9 changes: 9 additions & 0 deletions proj/vs2017/Scenario Editor/Scenario Editor.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,15 @@
<ClCompile Include="..\..\..\src\scenedit\scen.townout.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\fileio\fileio_party.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\universe\universe.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\universe\party.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\src\scenedit\scen.actions.hpp">
Expand Down
12 changes: 6 additions & 6 deletions proj/vs2017/Tests/Tests.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,36 +23,36 @@
<ProjectGuid>{46525FDB-EB90-4ACA-9FFC-D305646C3E57}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>Tests</RootNamespace>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
<ProjectSubType>NativeUnitTestProject</ProjectSubType>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
<UseOfMfc>false</UseOfMfc>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
<UseOfMfc>false</UseOfMfc>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
<UseOfMfc>false</UseOfMfc>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<UseOfMfc>false</UseOfMfc>
Expand Down Expand Up @@ -227,4 +227,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>
Loading

0 comments on commit c061ed4

Please sign in to comment.