Skip to content

SDL Windows Upgrade #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
micheldebree merged 3 commits into from
Oct 4, 2025
Merged

SDL Windows Upgrade #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9646cf9
Updated SDL to 2.32.10
realdmx Sep 20, 2025
8a7add2
Remove x64 config
realdmx Sep 20, 2025
d2ea940
Added Windows SDL upgrade to changelog
micheldebree Oct 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ binaries](https://github.com/micheldebree/sidfactory2/workflows/Build%20macOS%20

### Next release

- (macOS) SDL2 upgraded to 2.32.10
- SDL2 upgraded to 2.32.10 (Windows and macOS)
- Added [#4](https://github.com/micheldebree/sidfactory2/issues/4) Support for C64 font.
This can be selected with the new `Window.Font` configuration option.
- Added [#190](https://github.com/Chordian/sidfactory2/issues/190)
Expand Down
10 changes: 2 additions & 8 deletions SIDFactoryII.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,18 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30413.136
# Visual Studio Version 17
VisualStudioVersion = 17.13.35919.96 d17.13
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SIDFactoryII", "SIDFactoryII\SIDFactoryII.vcxproj", "{9E0ABB2E-3E97-4CA7-BB18-77B3CA8768FA}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{9E0ABB2E-3E97-4CA7-BB18-77B3CA8768FA}.Debug|x64.ActiveCfg = Debug|x64
{9E0ABB2E-3E97-4CA7-BB18-77B3CA8768FA}.Debug|x64.Build.0 = Debug|x64
{9E0ABB2E-3E97-4CA7-BB18-77B3CA8768FA}.Debug|x86.ActiveCfg = Debug|Win32
{9E0ABB2E-3E97-4CA7-BB18-77B3CA8768FA}.Debug|x86.Build.0 = Debug|Win32
{9E0ABB2E-3E97-4CA7-BB18-77B3CA8768FA}.Release|x64.ActiveCfg = Release|x64
{9E0ABB2E-3E97-4CA7-BB18-77B3CA8768FA}.Release|x64.Build.0 = Release|x64
{9E0ABB2E-3E97-4CA7-BB18-77B3CA8768FA}.Release|x86.ActiveCfg = Release|Win32
{9E0ABB2E-3E97-4CA7-BB18-77B3CA8768FA}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
Expand Down
Binary file modified SIDFactoryII/SDL2.dll
View file
Open in desktop
Binary file not shown.
22 changes: 11 additions & 11 deletions SIDFactoryII/SIDFactoryII.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
Expand Down Expand Up @@ -78,12 +78,12 @@
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>.;.\source;.\source\libraries;..\libs\SDL2-2.0.12\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.;.\source;.\source\libraries;..\libs\SDL2-2.32.10\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_SF2_WINDOWS;__SSE__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<LanguageStandard>stdcpp17</LanguageStandard>
</ClCompile>
<Link>
<AdditionalLibraryDirectories>..\libs\SDL2-2.0.12\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>..\libs\SDL2-2.32.10\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Windows</SubSystem>
</Link>
Expand All @@ -94,12 +94,12 @@
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>.\source;..\libs\SDL2-2.0.12\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.\source;..\libs\SDL2-2.32.10\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<AdditionalDependencies>sdl2.lib;sdl2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>..\libs\SDL2-2.0.12\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>..\libs\SDL2-2.32.10\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Expand All @@ -110,7 +110,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>.;.\source;.\source\libraries;..\libs\SDL2-2.0.12\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.;.\source;.\source\libraries;..\libs\SDL2-2.32.10\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_SF2_WINDOWS;__SSE__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<LanguageStandard>stdcpp17</LanguageStandard>
Expand All @@ -120,7 +120,7 @@
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>..\libs\SDL2-2.0.12\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>..\libs\SDL2-2.32.10\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Windows</SubSystem>
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
Expand All @@ -134,14 +134,14 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>.\source;..\libs\SDL2-2.0.12\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.\source;..\libs\SDL2-2.32.10\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<SubSystem>Console</SubSystem>
<AdditionalDependencies>sdl2.lib;sdl2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>..\libs\SDL2-2.0.12\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>..\libs\SDL2-2.32.10\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
Expand Down Expand Up @@ -508,4 +508,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>
24 changes: 17 additions & 7 deletions SIDFactoryII/SIDFactoryII.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,9 +392,6 @@
<ClCompile Include="source\runtime\editor\visualizer_components\vizualizer_component_emulation_state.cpp">
<Filter>source\runtime\editor\visualizer_components</Filter>
</ClCompile>
<ClCompile Include="source\runtime\editor\overlays\overlay_flightrecorder.cpp">
<Filter>source\runtime\editor\overlays</Filter>
</ClCompile>
<ClCompile Include="source\runtime\editor\components\component_flightrecorder.cpp">
<Filter>source\runtime\editor\components</Filter>
</ClCompile>
Expand Down Expand Up @@ -617,6 +614,18 @@
<ClCompile Include="source\runtime\editor\dialog\dialog_move_selection_list.cpp">
<Filter>source\runtime\editor\dialogs</Filter>
</ClCompile>
<ClCompile Include="source\runtime\editor\components\component_pulse_filter_visualizer.cpp">
<Filter>source</Filter>
</ClCompile>
<ClCompile Include="source\runtime\editor\datasources\datasource_sidregistersbuffer.cpp">
<Filter>source</Filter>
</ClCompile>
<ClCompile Include="source\runtime\editor\overlays\overlay_flightrecorder.cpp">
<Filter>source</Filter>
</ClCompile>
<ClCompile Include="source\runtime\editor\visualizer_components\visualizer_component_pulse_filter_state.cpp">
<Filter>source</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="source\utils\utilities.h">
Expand Down Expand Up @@ -904,9 +913,6 @@
<ClInclude Include="source\runtime\editor\visualizer_components\vizualizer_component_emulation_state.h">
<Filter>source\runtime\editor\visualizer_components</Filter>
</ClInclude>
<ClInclude Include="source\runtime\editor\overlays\overlay_flightrecorder.h">
<Filter>source\runtime\editor\overlays</Filter>
</ClInclude>
<ClInclude Include="source\runtime\editor\components\component_flightrecorder.h">
<Filter>source\runtime\editor\components</Filter>
</ClInclude>
Expand Down Expand Up @@ -1188,8 +1194,12 @@
<ClInclude Include="source\runtime\editor\dialog\dialog_move_selection_list.h">
<Filter>source\runtime\editor\dialogs</Filter>
</ClInclude>
<ClInclude Include="source\runtime\editor\components\component_pulse_filter_visualizer.h" />
<ClInclude Include="source\runtime\editor\datasources\datasource_sidregistersbuffer.h" />
<ClInclude Include="source\runtime\editor\overlays\overlay_flightrecorder.h" />
<ClInclude Include="source\runtime\editor\visualizer_components\visualizer_component_pulse_filter_state.h" />
</ItemGroup>
<ItemGroup>
<Text Include="change_todo.txt" />
</ItemGroup>
</Project>
</Project>
84 changes: 0 additions & 84 deletions libs/SDL2-2.0.12/docs/README-cmake.md
View file
Open in desktop

This file was deleted.

35 changes: 0 additions & 35 deletions libs/SDL2-2.0.12/docs/README-emscripten.md
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions libs/SDL2-2.0.12/docs/README-hg.md
View file
Open in desktop

This file was deleted.

Loading