Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 10 additions & 2 deletions .github/workflows/build_base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,16 @@ jobs:
if: matrix.target.os == 'windows-latest'
shell: pwsh
run: |
winget install -e --id MartinStorsjo.LLVM-MinGW.UCRT --accept-package-agreements --accept-source-agreements
winget install -e --id Kitware.CMake --accept-package-agreements --accept-source-agreements
function Install-Tool($id) {
winget install -e --id $id --accept-package-agreements --accept-source-agreements --disable-interactivity
if ($LASTEXITCODE -eq 0 -or $LASTEXITCODE -eq -1978335189 -or $LASTEXITCODE -eq -1978335212) {
$global:LASTEXITCODE = 0
} else {
throw "winget install $id failed with exit code $LASTEXITCODE"
}
}
Install-Tool MartinStorsjo.LLVM-MinGW.UCRT
Install-Tool Kitware.CMake

- name: Setup just
uses: extractions/setup-just@v3
Expand Down
2 changes: 1 addition & 1 deletion cli/cmd/sisr/hints.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ var sdlHints = map[sdl.Hint]string{
sdl.HintJoystickHIDAPIGIP: "1",

sdl.HintJoystickWGI: "0",
sdl.HintJoystickGameinput: "0",
sdl.HintJoystickGameinput: "1",

// sdl.HintHIDAPILibUSB: "1",
}
Expand Down
2 changes: 1 addition & 1 deletion deps/SDL
Submodule SDL updated 89 files
+15 −8 .github/workflows/create-test-plan.py
+6 −7 .github/workflows/generic.yml
+2 −0 Android.mk
+74 −5 CMakeLists.txt
+11 −6 VisualC-GDK/SDL/SDL.vcxproj
+6 −1 VisualC-GDK/SDL/SDL.vcxproj.filters
+6 −1 VisualC/SDL/SDL.vcxproj
+21 −0 VisualC/SDL/SDL.vcxproj.filters
+46 −8 Xcode/SDL/SDL.xcodeproj/project.pbxproj
+87 −0 Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj
+2 −2 android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
+81 −70 android-project/app/src/main/java/org/libsdl/app/SDLControllerManager.java
+9 −3 build-scripts/build-release.py
+5 −0 build-scripts/check_stdlib_usage.py
+12 −9 build-scripts/download-gameinput-sdk.py
+1 −1 build-scripts/release-info.json
+8 −5 cmake/PreseedDOSCache.cmake
+3 −0 cmake/PreseedEmscriptenCache.cmake
+3 −0 cmake/PreseedMSVCCache.cmake
+3 −0 cmake/PreseedNokiaNGageCache.cmake
+1 −1 cmake/sdlchecks.cmake
+3 −1 cmake/sdlcommands.cmake
+2 −2 docs/README-android.md
+1 −1 docs/hello.c
+2 −1 examples/audio/03-load-wav/load-wav.c
+1 −0 include/SDL3/SDL.h
+23 −0 include/SDL3/SDL_events.h
+263 −0 include/SDL3/SDL_notification.h
+87 −0 include/SDL3/SDL_stdinc.h
+4 −0 include/build_config/SDL_build_config.h.cmake
+9 −2 src/SDL.c
+31 −11 src/audio/SDL_audio.c
+22 −5 src/core/android/SDL_android.c
+35 −19 src/core/windows/SDL_gameinput.cpp
+5 −6 src/core/windows/SDL_gameinput.h
+5 −0 src/core/windows/SDL_windows.c
+3 −0 src/core/windows/SDL_windows.h
+7 −0 src/dynapi/SDL_dynapi.exports
+7 −0 src/dynapi/SDL_dynapi.sym
+7 −0 src/dynapi/SDL_dynapi_overrides.h
+7 −0 src/dynapi/SDL_dynapi_procs.h
+3 −0 src/events/SDL_categories.c
+1 −0 src/events/SDL_categories_c.h
+5 −0 src/events/SDL_events.c
+41 −0 src/events/SDL_notificationevents.c
+30 −0 src/events/SDL_notificationevents_c.h
+151 −66 src/hidapi/SDL_hidapi.c
+1 −1 src/hidapi/SDL_hidapi_c.h
+1 −1 src/hidapi/android/hid.cpp
+1 −1 src/hidapi/ios/hid.m
+124 −32 src/hidapi/libusb/hid.c
+20 −4 src/hidapi/libusb/hidapi_thread_sdl.h
+1 −1 src/hidapi/linux/hid.c
+1 −1 src/hidapi/mac/hid.c
+1 −1 src/hidapi/windows/hid.c
+3 −0 src/joystick/SDL_gamepad.c
+1 −2 src/joystick/SDL_gamepad_db.h
+2 −0 src/joystick/SDL_joystick.c
+13 −5 src/joystick/android/SDL_sysjoystick.c
+69 −19 src/joystick/emscripten/SDL_sysjoystick.c
+25 −2 src/joystick/gdk/SDL_gameinputjoystick.cpp
+21 −14 src/joystick/hidapi/SDL_hidapi_xbox360.c
+7 −2 src/joystick/hidapi/SDL_hidapi_xboxone.c
+4 −0 src/joystick/hidapi/SDL_hidapijoystick.c
+4 −0 src/joystick/usb_ids.h
+4 −0 src/misc/SDL_libusb.c
+4 −0 src/misc/SDL_libusb.h
+85 −0 src/notification/SDL_notification.c
+38 −0 src/notification/SDL_notification_c.h
+360 −0 src/notification/cocoa/SDL_cocoanotification.m
+58 −0 src/notification/dummy/SDL_dummynotification.c
+1,584 −0 src/notification/unix/SDL_dbusnotification.c
+1,161 −0 src/notification/windows/SDL_windowsnotification.c
+105 −1 src/stdlib/SDL_string.c
+4 −0 src/test/SDL_test_common.c
+1 −1 src/video/dos/SDL_dosframebuffer.c
+185 −2 src/video/khronos/vulkan/vulkan_core.h
+3 −3 src/video/kmsdrm/SDL_kmsdrmopengles.c
+6 −6 src/video/wayland/SDL_waylandopengles.c
+5 −0 src/video/wayland/SDL_waylandutil.c
+24 −0 src/video/wayland/SDL_waylandwindow.c
+2 −2 src/video/windows/SDL_windowsevents.c
+9 −0 src/video/x11/SDL_x11opengles.c
+1 −0 src/video/x11/SDL_x11opengles.h
+1 −0 src/video/x11/SDL_x11video.c
+1 −0 test/CMakeLists.txt
+2 −1 test/LICENSE.txt
+69 −35 test/testautomation_stdlib.c
+159 −0 test/testnotification.c
1 change: 1 addition & 0 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ win-resource:

[arg("type", long="type", help="Build type (Debug/Release)")]
build-sdl type="Debug":
{{ if os_family() == "windows" { "if (!(Test-Path deps/SDL/include/gameinput.h)) { python deps/SDL/build-scripts/download-gameinput-sdk.py -o deps/SDL }" } else { "true" } }}
{{
if os_family() == "windows" {
"if (!(Test-Path deps/SDL/build)) { cmake -S deps/SDL -B deps/SDL/build -DSDL_TEST_LIBRARY=OFF -DSDL_TESTS=OFF -DSDL_INSTALL_TESTS=OFF }"
Expand Down
Loading