Skip to content

Commit

Permalink
project: Update for 2.30.0 merge.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Sibras
Sibras committed Apr 6, 2024
1 parent 4384ed3 commit f44ec01
Show file tree
Hide file tree
Showing 3 changed files with 91 additions and 20 deletions.
48 changes: 39 additions & 9 deletions SMP/libsdl.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -876,9 +876,6 @@
<ClInclude Include="..\src\video\khronos\vulkan\vk_sdk_platform.h">
<Filter>Header Files\src\video\khronos\vulkan</Filter>
</ClInclude>
<ClInclude Include="..\src\video\khronos\vulkan\vulkan.hpp">
<Filter>Header Files\src\video\khronos\vulkan</Filter>
</ClInclude>
<ClInclude Include="..\src\video\khronos\vulkan\vulkan_core.h">
<Filter>Header Files\src\video\khronos\vulkan</Filter>
</ClInclude>
Expand Down Expand Up @@ -969,6 +966,27 @@
<ClInclude Include="..\src\joystick\hidapi\SDL_hidapi_nintendo.h">
<Filter>Header Files\src\joystick\hidapi</Filter>
</ClInclude>
<ClInclude Include="..\src\video\yuv2rgb\yuv_rgb_internal.h">
<Filter>Header Files\src\video\yuv2rgb</Filter>
</ClInclude>
<ClInclude Include="..\src\video\yuv2rgb\yuv_rgb_lsx.h">
<Filter>Header Files\src\video\yuv2rgb</Filter>
</ClInclude>
<ClInclude Include="..\src\video\yuv2rgb\yuv_rgb_lsx_func.h">
<Filter>Header Files\src\video\yuv2rgb</Filter>
</ClInclude>
<ClInclude Include="..\src\video\yuv2rgb\yuv_rgb_sse.h">
<Filter>Header Files\src\video\yuv2rgb</Filter>
</ClInclude>
<ClInclude Include="..\src\video\yuv2rgb\yuv_rgb_std.h">
<Filter>Header Files\src\video\yuv2rgb</Filter>
</ClInclude>
<ClInclude Include="..\src\video\yuv2rgb\yuv_rgb_common.h">
<Filter>Header Files\src\video\yuv2rgb</Filter>
</ClInclude>
<ClInclude Include="..\src\joystick\SDL_steam_virtual_gamepad.h">
<Filter>Header Files\src\joystick</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\SDL.c">
Expand Down Expand Up @@ -1250,9 +1268,6 @@
<ClCompile Include="..\src\SDL_hints.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\filesystem\windows\SDL_sysfilesystem.c">
<Filter>Source Files\filesystem\windows</Filter>
</ClCompile>
<ClCompile Include="..\src\dynapi\SDL_dynapi.c">
<Filter>Source Files\dynapi</Filter>
</ClCompile>
Expand Down Expand Up @@ -1322,9 +1337,6 @@
<ClCompile Include="..\src\video\SDL_yuv.c">
<Filter>Source Files\video</Filter>
</ClCompile>
<ClCompile Include="..\src\video\yuv2rgb\yuv_rgb.c">
<Filter>Source Files\video\yuv2rgb</Filter>
</ClCompile>
<ClCompile Include="..\src\core\winrt\SDL_winrtapp_common.cpp">
<Filter>Source Files\core\winrt</Filter>
</ClCompile>
Expand Down Expand Up @@ -1508,6 +1520,24 @@
<ClCompile Include="..\src\joystick\hidapi\SDL_hidapi_steam.c">
<Filter>Source Files\joystick\hidapi</Filter>
</ClCompile>
<ClCompile Include="..\src\video\yuv2rgb\yuv_rgb_std.c">
<Filter>Source Files\video\yuv2rgb</Filter>
</ClCompile>
<ClCompile Include="..\src\video\yuv2rgb\yuv_rgb_lsx.c">
<Filter>Source Files\video\yuv2rgb</Filter>
</ClCompile>
<ClCompile Include="..\src\video\yuv2rgb\yuv_rgb_sse.c">
<Filter>Source Files\video\yuv2rgb</Filter>
</ClCompile>
<ClCompile Include="..\src\joystick\SDL_steam_virtual_gamepad.c">
<Filter>Source Files\joystick</Filter>
</ClCompile>
<ClCompile Include="..\src\joystick\hidapi\SDL_hidapi_steamdeck.c">
<Filter>Source Files\joystick\hidapi</Filter>
</ClCompile>
<ClCompile Include="..\src\filesystem\windows\SDL_sysfilesystem.c">
<Filter>Source Files\filesystem\windows</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\src\main\windows\version.rc">
Expand Down
15 changes: 13 additions & 2 deletions SMP/libsdl_files.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@
<ClInclude Include="..\src\joystick\hidapi\steam\controller_constants.h" />
<ClInclude Include="..\src\joystick\hidapi\steam\controller_structs.h" />
<ClInclude Include="..\src\joystick\SDL_gamecontrollerdb.h" />
<ClInclude Include="..\src\joystick\SDL_steam_virtual_gamepad.h" />
<ClInclude Include="..\src\joystick\steam\SDL_steamcontroller.h" />
<ClInclude Include="..\src\joystick\usb_ids.h" />
<ClInclude Include="..\src\joystick\virtual\SDL_virtualjoystick_c.h" />
Expand Down Expand Up @@ -203,7 +204,13 @@
<ClInclude Include="..\src\events\SDL_windowevents_c.h" />
<ClInclude Include="..\src\video\windows\wmmsg.h" />
<ClInclude Include="..\src\video\yuv2rgb\yuv_rgb.h" />
<ClInclude Include="..\src\video\yuv2rgb\yuv_rgb_common.h" />
<ClInclude Include="..\src\video\yuv2rgb\yuv_rgb_internal.h" />
<ClInclude Include="..\src\video\yuv2rgb\yuv_rgb_lsx.h" />
<ClInclude Include="..\src\video\yuv2rgb\yuv_rgb_lsx_func.h" />
<ClInclude Include="..\src\video\yuv2rgb\yuv_rgb_sse.h" />
<ClInclude Include="..\src\video\yuv2rgb\yuv_rgb_sse_func.h" />
<ClInclude Include="..\src\video\yuv2rgb\yuv_rgb_std.h" />
<ClInclude Include="..\src\video\yuv2rgb\yuv_rgb_std_func.h" />
<ClInclude Include="..\src\video\winrt\SDL_winrtevents_c.h" />
<ClInclude Include="..\src\video\winrt\SDL_winrtgamebar_cpp.h" />
Expand Down Expand Up @@ -301,6 +308,8 @@
<ClCompile Include="..\src\haptic\windows\SDL_xinputhaptic.c" />
<ClCompile Include="..\src\hidapi\SDL_hidapi.c" />
<ClCompile Include="..\src\joystick\controller_type.c" />
<ClCompile Include="..\src\joystick\SDL_joystick.c" />
<ClCompile Include="..\src\joystick\SDL_steam_virtual_gamepad.c" />
<ClCompile Include="..\src\joystick\dummy\SDL_sysjoystick.c" />
<ClCompile Include="..\src\joystick\hidapi\SDL_hidapijoystick.c" />
<ClCompile Include="..\src\joystick\hidapi\SDL_hidapi_combined.c" />
Expand All @@ -313,6 +322,7 @@
<ClCompile Include="..\src\joystick\hidapi\SDL_hidapi_shield.c" />
<ClCompile Include="..\src\joystick\hidapi\SDL_hidapi_stadia.c" />
<ClCompile Include="..\src\joystick\hidapi\SDL_hidapi_steam.c" />
<ClCompile Include="..\src\joystick\hidapi\SDL_hidapi_steamdeck.c" />
<ClCompile Include="..\src\joystick\hidapi\SDL_hidapi_switch.c" />
<ClCompile Include="..\src\joystick\hidapi\SDL_hidapi_xbox360.c" />
<ClCompile Include="..\src\joystick\hidapi\SDL_hidapi_xbox360w.c" />
Expand Down Expand Up @@ -437,7 +447,6 @@
<ClCompile Include="..\src\events\SDL_events.c" />
<ClCompile Include="..\src\video\SDL_fillrect.c" />
<ClCompile Include="..\src\haptic\SDL_haptic.c" />
<ClCompile Include="..\src\joystick\SDL_joystick.c" />
<ClCompile Include="..\src\events\SDL_keyboard.c" />
<ClCompile Include="..\src\audio\SDL_mixer.c" />
<ClCompile Include="..\src\events\SDL_mouse.c" />
Expand Down Expand Up @@ -485,7 +494,9 @@
<ClCompile Include="..\src\video\windows\SDL_windowswindow.c" />
<ClCompile Include="..\src\events\SDL_windowevents.c" />
<ClCompile Include="..\src\joystick\SDL_gamecontroller.c" />
<ClCompile Include="..\src\video\yuv2rgb\yuv_rgb.c" />
<ClCompile Include="..\src\video\yuv2rgb\yuv_rgb_lsx.c" />
<ClCompile Include="..\src\video\yuv2rgb\yuv_rgb_sse.c" />
<ClCompile Include="..\src\video\yuv2rgb\yuv_rgb_std.c" />
<ClCompile Include="..\src\video\winrt\SDL_winrtevents.cpp">
<CompileAsWinRT Condition="'$(Configuration)'=='DebugDLLWinRT'">true</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)'=='ReleaseWinRT'">true</CompileAsWinRT>
Expand Down
48 changes: 39 additions & 9 deletions SMP/libsdl_winrt.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -876,9 +876,6 @@
<ClInclude Include="..\src\video\khronos\vulkan\vk_sdk_platform.h">
<Filter>Header Files\src\video\khronos\vulkan</Filter>
</ClInclude>
<ClInclude Include="..\src\video\khronos\vulkan\vulkan.hpp">
<Filter>Header Files\src\video\khronos\vulkan</Filter>
</ClInclude>
<ClInclude Include="..\src\video\khronos\vulkan\vulkan_core.h">
<Filter>Header Files\src\video\khronos\vulkan</Filter>
</ClInclude>
Expand Down Expand Up @@ -969,6 +966,27 @@
<ClInclude Include="..\src\joystick\hidapi\SDL_hidapi_nintendo.h">
<Filter>Header Files\src\joystick\hidapi</Filter>
</ClInclude>
<ClInclude Include="..\src\video\yuv2rgb\yuv_rgb_common.h">
<Filter>Header Files\src\video\yuv2rgb</Filter>
</ClInclude>
<ClInclude Include="..\src\video\yuv2rgb\yuv_rgb_internal.h">
<Filter>Header Files\src\video\yuv2rgb</Filter>
</ClInclude>
<ClInclude Include="..\src\video\yuv2rgb\yuv_rgb_lsx.h">
<Filter>Header Files\src\video\yuv2rgb</Filter>
</ClInclude>
<ClInclude Include="..\src\video\yuv2rgb\yuv_rgb_lsx_func.h">
<Filter>Header Files\src\video\yuv2rgb</Filter>
</ClInclude>
<ClInclude Include="..\src\video\yuv2rgb\yuv_rgb_sse.h">
<Filter>Header Files\src\video\yuv2rgb</Filter>
</ClInclude>
<ClInclude Include="..\src\video\yuv2rgb\yuv_rgb_std.h">
<Filter>Header Files\src\video\yuv2rgb</Filter>
</ClInclude>
<ClInclude Include="..\src\joystick\SDL_steam_virtual_gamepad.h">
<Filter>Header Files\src\joystick</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\SDL.c">
Expand Down Expand Up @@ -1250,9 +1268,6 @@
<ClCompile Include="..\src\SDL_hints.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\filesystem\windows\SDL_sysfilesystem.c">
<Filter>Source Files\filesystem\windows</Filter>
</ClCompile>
<ClCompile Include="..\src\dynapi\SDL_dynapi.c">
<Filter>Source Files\dynapi</Filter>
</ClCompile>
Expand Down Expand Up @@ -1322,9 +1337,6 @@
<ClCompile Include="..\src\video\SDL_yuv.c">
<Filter>Source Files\video</Filter>
</ClCompile>
<ClCompile Include="..\src\video\yuv2rgb\yuv_rgb.c">
<Filter>Source Files\video\yuv2rgb</Filter>
</ClCompile>
<ClCompile Include="..\src\core\winrt\SDL_winrtapp_common.cpp">
<Filter>Source Files\core\winrt</Filter>
</ClCompile>
Expand Down Expand Up @@ -1508,6 +1520,24 @@
<ClCompile Include="..\src\joystick\hidapi\SDL_hidapi_steam.c">
<Filter>Source Files\joystick\hidapi</Filter>
</ClCompile>
<ClCompile Include="..\src\video\yuv2rgb\yuv_rgb_lsx.c">
<Filter>Source Files\video\yuv2rgb</Filter>
</ClCompile>
<ClCompile Include="..\src\video\yuv2rgb\yuv_rgb_sse.c">
<Filter>Source Files\video\yuv2rgb</Filter>
</ClCompile>
<ClCompile Include="..\src\video\yuv2rgb\yuv_rgb_std.c">
<Filter>Source Files\video\yuv2rgb</Filter>
</ClCompile>
<ClCompile Include="..\src\joystick\SDL_steam_virtual_gamepad.c">
<Filter>Source Files\joystick</Filter>
</ClCompile>
<ClCompile Include="..\src\joystick\hidapi\SDL_hidapi_steamdeck.c">
<Filter>Source Files\joystick\hidapi</Filter>
</ClCompile>
<ClCompile Include="..\src\filesystem\windows\SDL_sysfilesystem.c">
<Filter>Source Files\filesystem\windows</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\src\main\windows\version.rc">
Expand Down

0 comments on commit f44ec01

Please sign in to comment.