Skip to content

Commit 03ddf73

Browse files
tpglitchpbatard
tpglitch
authored and
pbatard
committed
[internal] update solution files and workflows to VS2026
* Also remove ARM support. * Closes #2925.
1 parent 33ed3f8 commit 03ddf73

17 files changed

Lines changed: 91 additions & 924 deletions

‎.github/workflows/setup.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ env:
1010
BUILD_CONFIGURATION: Release
1111

1212
jobs:
13-
VS2022-Build:
13+
VS2026-Build:
1414
runs-on: windows-latest
1515

1616
strategy:
@@ -43,7 +43,7 @@ jobs:
4343

4444
Extra-Step-To-Merge-Artifacts-Thanks-To-Upload-Artifact-v4-Breaking-Backwards-Compatibility:
4545
runs-on: windows-latest
46-
needs: VS2022-Build
46+
needs: VS2026-Build
4747
steps:
4848
- name: Merge Artifacts
4949
uses: actions/upload-artifact/merge@v7

.github/workflows/vs2022.yml renamed to .github/workflows/vs2026.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: VS2022
1+
name: VS2026
22

33
on:
44
push:
@@ -31,7 +31,7 @@ env:
3131
BUILD_CONFIGURATION: Release
3232

3333
jobs:
34-
VS2022-Build:
34+
VS2026-Build:
3535
runs-on: windows-latest
3636

3737
strategy:
@@ -136,11 +136,11 @@ jobs:
136136
137137
Extra-Step-To-Merge-Artifacts-Thanks-To-Upload-Artifact-v4-Breaking-Backwards-Compatibility:
138138
runs-on: windows-latest
139-
needs: VS2022-Build
139+
needs: VS2026-Build
140140
steps:
141141
- name: Merge Artifacts
142142
uses: actions/upload-artifact/merge@v7
143143
if: ${{ github.event_name == 'push' }}
144144
with:
145-
name: VS2022
145+
name: VS2026
146146
delete-merged: true

‎.vs/bled.vcxproj‎

Lines changed: 6 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
4-
<ProjectConfiguration Include="Debug|ARM">
5-
<Configuration>Debug</Configuration>
6-
<Platform>ARM</Platform>
7-
</ProjectConfiguration>
84
<ProjectConfiguration Include="Debug|ARM64">
95
<Configuration>Debug</Configuration>
106
<Platform>ARM64</Platform>
@@ -17,10 +13,6 @@
1713
<Configuration>Debug</Configuration>
1814
<Platform>x64</Platform>
1915
</ProjectConfiguration>
20-
<ProjectConfiguration Include="Release|ARM">
21-
<Configuration>Release</Configuration>
22-
<Platform>ARM</Platform>
23-
</ProjectConfiguration>
2416
<ProjectConfiguration Include="Release|ARM64">
2517
<Configuration>Release</Configuration>
2618
<Platform>ARM64</Platform>
@@ -110,58 +102,41 @@
110102
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
111103
<ConfigurationType>StaticLibrary</ConfigurationType>
112104
<CharacterSet>Unicode</CharacterSet>
113-
<PlatformToolset>v143</PlatformToolset>
114-
</PropertyGroup>
115-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
116-
<ConfigurationType>StaticLibrary</ConfigurationType>
117-
<CharacterSet>Unicode</CharacterSet>
118-
<PlatformToolset>v143</PlatformToolset>
119-
<WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
105+
<PlatformToolset>v145</PlatformToolset>
120106
</PropertyGroup>
121107
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
122108
<ConfigurationType>StaticLibrary</ConfigurationType>
123109
<CharacterSet>Unicode</CharacterSet>
124-
<PlatformToolset>v143</PlatformToolset>
110+
<PlatformToolset>v145</PlatformToolset>
125111
<WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
126112
</PropertyGroup>
127113
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
128114
<ConfigurationType>StaticLibrary</ConfigurationType>
129115
<CharacterSet>Unicode</CharacterSet>
130-
<PlatformToolset>v143</PlatformToolset>
116+
<PlatformToolset>v145</PlatformToolset>
131117
</PropertyGroup>
132118
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
133119
<ConfigurationType>StaticLibrary</ConfigurationType>
134120
<CharacterSet>Unicode</CharacterSet>
135-
<PlatformToolset>v143</PlatformToolset>
136-
<UseDebugLibraries>true</UseDebugLibraries>
137-
</PropertyGroup>
138-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
139-
<ConfigurationType>StaticLibrary</ConfigurationType>
140-
<CharacterSet>Unicode</CharacterSet>
141-
<PlatformToolset>v143</PlatformToolset>
142-
<WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
121+
<PlatformToolset>v145</PlatformToolset>
143122
<UseDebugLibraries>true</UseDebugLibraries>
144123
</PropertyGroup>
145124
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
146125
<ConfigurationType>StaticLibrary</ConfigurationType>
147126
<CharacterSet>Unicode</CharacterSet>
148-
<PlatformToolset>v143</PlatformToolset>
127+
<PlatformToolset>v145</PlatformToolset>
149128
<WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
150129
<UseDebugLibraries>true</UseDebugLibraries>
151130
</PropertyGroup>
152131
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
153132
<ConfigurationType>StaticLibrary</ConfigurationType>
154133
<CharacterSet>Unicode</CharacterSet>
155-
<PlatformToolset>v143</PlatformToolset>
134+
<PlatformToolset>v145</PlatformToolset>
156135
<UseDebugLibraries>true</UseDebugLibraries>
157136
</PropertyGroup>
158137
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
159138
<PropertyGroup>
160139
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
161-
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">$(SolutionDir)arm\$(Configuration)\</OutDir>
162-
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">$(SolutionDir)arm\$(Configuration)\$(ProjectName)\</IntDir>
163-
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">$(SolutionDir)arm\$(Configuration)\</OutDir>
164-
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">$(SolutionDir)arm\$(Configuration)\$(ProjectName)\</IntDir>
165140
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(SolutionDir)arm64\$(Configuration)\</OutDir>
166141
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(SolutionDir)arm64\$(Configuration)\$(ProjectName)\</IntDir>
167142
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(SolutionDir)arm64\$(Configuration)\</OutDir>
@@ -174,8 +149,6 @@
174149
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)x64\$(Configuration)\$(ProjectName)\</IntDir>
175150
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)x64\$(Configuration)\</OutDir>
176151
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)x64\$(Configuration)\$(ProjectName)\</IntDir>
177-
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</LinkIncremental>
178-
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</LinkIncremental>
179152
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">false</LinkIncremental>
180153
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">false</LinkIncremental>
181154
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
@@ -202,24 +175,6 @@
202175
<AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
203176
</Link>
204177
</ItemDefinitionGroup>
205-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
206-
<ClCompile>
207-
<WarningLevel>Level3</WarningLevel>
208-
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
209-
<Optimization>Disabled</Optimization>
210-
<PreprocessorDefinitions>_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
211-
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
212-
<AdditionalIncludeDirectories>..\src</AdditionalIncludeDirectories>
213-
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
214-
</ClCompile>
215-
<Link>
216-
<SuppressStartupBanner>true</SuppressStartupBanner>
217-
<LinkDLL>true</LinkDLL>
218-
<GenerateDebugInformation>true</GenerateDebugInformation>
219-
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
220-
<AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
221-
</Link>
222-
</ItemDefinitionGroup>
223178
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
224179
<ClCompile>
225180
<WarningLevel>Level3</WarningLevel>
@@ -278,26 +233,6 @@
278233
<LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
279234
</Lib>
280235
</ItemDefinitionGroup>
281-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
282-
<ClCompile>
283-
<WarningLevel>Level3</WarningLevel>
284-
<IntrinsicFunctions>true</IntrinsicFunctions>
285-
<PreprocessorDefinitions>_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
286-
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
287-
<AdditionalIncludeDirectories>..\src</AdditionalIncludeDirectories>
288-
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
289-
<StringPooling>true</StringPooling>
290-
</ClCompile>
291-
<Link>
292-
<SuppressStartupBanner>true</SuppressStartupBanner>
293-
<LinkDLL>true</LinkDLL>
294-
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
295-
<AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
296-
</Link>
297-
<Lib>
298-
<LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
299-
</Lib>
300-
</ItemDefinitionGroup>
301236
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
302237
<ClCompile>
303238
<WarningLevel>Level3</WarningLevel>

‎.vs/ext2fs.vcxproj‎

Lines changed: 6 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
4-
<ProjectConfiguration Include="Debug|ARM">
5-
<Configuration>Debug</Configuration>
6-
<Platform>ARM</Platform>
7-
</ProjectConfiguration>
84
<ProjectConfiguration Include="Debug|ARM64">
95
<Configuration>Debug</Configuration>
106
<Platform>ARM64</Platform>
@@ -17,10 +13,6 @@
1713
<Configuration>Debug</Configuration>
1814
<Platform>x64</Platform>
1915
</ProjectConfiguration>
20-
<ProjectConfiguration Include="Release|ARM">
21-
<Configuration>Release</Configuration>
22-
<Platform>ARM</Platform>
23-
</ProjectConfiguration>
2416
<ProjectConfiguration Include="Release|ARM64">
2517
<Configuration>Release</Configuration>
2618
<Platform>ARM64</Platform>
@@ -122,58 +114,41 @@
122114
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
123115
<ConfigurationType>StaticLibrary</ConfigurationType>
124116
<CharacterSet>Unicode</CharacterSet>
125-
<PlatformToolset>v143</PlatformToolset>
126-
</PropertyGroup>
127-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
128-
<ConfigurationType>StaticLibrary</ConfigurationType>
129-
<CharacterSet>Unicode</CharacterSet>
130-
<PlatformToolset>v143</PlatformToolset>
131-
<WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
117+
<PlatformToolset>v145</PlatformToolset>
132118
</PropertyGroup>
133119
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
134120
<ConfigurationType>StaticLibrary</ConfigurationType>
135121
<CharacterSet>Unicode</CharacterSet>
136-
<PlatformToolset>v143</PlatformToolset>
122+
<PlatformToolset>v145</PlatformToolset>
137123
<WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
138124
</PropertyGroup>
139125
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
140126
<ConfigurationType>StaticLibrary</ConfigurationType>
141127
<CharacterSet>Unicode</CharacterSet>
142-
<PlatformToolset>v143</PlatformToolset>
128+
<PlatformToolset>v145</PlatformToolset>
143129
</PropertyGroup>
144130
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
145131
<ConfigurationType>StaticLibrary</ConfigurationType>
146132
<CharacterSet>Unicode</CharacterSet>
147-
<PlatformToolset>v143</PlatformToolset>
148-
<UseDebugLibraries>true</UseDebugLibraries>
149-
</PropertyGroup>
150-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
151-
<ConfigurationType>StaticLibrary</ConfigurationType>
152-
<CharacterSet>Unicode</CharacterSet>
153-
<PlatformToolset>v143</PlatformToolset>
154-
<WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
133+
<PlatformToolset>v145</PlatformToolset>
155134
<UseDebugLibraries>true</UseDebugLibraries>
156135
</PropertyGroup>
157136
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
158137
<ConfigurationType>StaticLibrary</ConfigurationType>
159138
<CharacterSet>Unicode</CharacterSet>
160-
<PlatformToolset>v143</PlatformToolset>
139+
<PlatformToolset>v145</PlatformToolset>
161140
<WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
162141
<UseDebugLibraries>true</UseDebugLibraries>
163142
</PropertyGroup>
164143
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
165144
<ConfigurationType>StaticLibrary</ConfigurationType>
166145
<CharacterSet>Unicode</CharacterSet>
167-
<PlatformToolset>v143</PlatformToolset>
146+
<PlatformToolset>v145</PlatformToolset>
168147
<UseDebugLibraries>true</UseDebugLibraries>
169148
</PropertyGroup>
170149
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
171150
<PropertyGroup>
172151
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
173-
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">$(SolutionDir)arm\$(Configuration)\</OutDir>
174-
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">$(SolutionDir)arm\$(Configuration)\$(ProjectName)\</IntDir>
175-
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">$(SolutionDir)arm\$(Configuration)\</OutDir>
176-
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">$(SolutionDir)arm\$(Configuration)\$(ProjectName)\</IntDir>
177152
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(SolutionDir)arm64\$(Configuration)\</OutDir>
178153
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(SolutionDir)arm64\$(Configuration)\$(ProjectName)\</IntDir>
179154
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(SolutionDir)arm64\$(Configuration)\</OutDir>
@@ -186,8 +161,6 @@
186161
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)x64\$(Configuration)\$(ProjectName)\</IntDir>
187162
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)x64\$(Configuration)\</OutDir>
188163
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)x64\$(Configuration)\$(ProjectName)\</IntDir>
189-
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</LinkIncremental>
190-
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</LinkIncremental>
191164
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">false</LinkIncremental>
192165
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">false</LinkIncremental>
193166
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
@@ -214,24 +187,6 @@
214187
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
215188
</Link>
216189
</ItemDefinitionGroup>
217-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
218-
<ClCompile>
219-
<WarningLevel>Level3</WarningLevel>
220-
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
221-
<Optimization>Disabled</Optimization>
222-
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
223-
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
224-
<AdditionalIncludeDirectories>..\src;..\src\msvc-missing</AdditionalIncludeDirectories>
225-
<DisableSpecificWarnings>4018;4146;4244;4267;4996</DisableSpecificWarnings>
226-
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
227-
</ClCompile>
228-
<Link>
229-
<SuppressStartupBanner>true</SuppressStartupBanner>
230-
<LinkDLL>true</LinkDLL>
231-
<GenerateDebugInformation>true</GenerateDebugInformation>
232-
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
233-
</Link>
234-
</ItemDefinitionGroup>
235190
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
236191
<ClCompile>
237192
<WarningLevel>Level3</WarningLevel>
@@ -291,26 +246,6 @@
291246
<LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
292247
</Lib>
293248
</ItemDefinitionGroup>
294-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
295-
<ClCompile>
296-
<WarningLevel>Level3</WarningLevel>
297-
<IntrinsicFunctions>true</IntrinsicFunctions>
298-
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
299-
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
300-
<AdditionalIncludeDirectories>..\src;..\src\msvc-missing</AdditionalIncludeDirectories>
301-
<DisableSpecificWarnings>4018;4146;4244;4267;4996</DisableSpecificWarnings>
302-
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
303-
<StringPooling>true</StringPooling>
304-
</ClCompile>
305-
<Link>
306-
<SuppressStartupBanner>true</SuppressStartupBanner>
307-
<LinkDLL>true</LinkDLL>
308-
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
309-
</Link>
310-
<Lib>
311-
<LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
312-
</Lib>
313-
</ItemDefinitionGroup>
314249
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
315250
<ClCompile>
316251
<WarningLevel>Level3</WarningLevel>

0 commit comments

Comments
 (0)