From 8f28ac7098c51094382413852dccb8fcb550b1ea Mon Sep 17 00:00:00 2001 From: staphen Date: Wed, 15 Jan 2025 18:07:09 -0500 Subject: [PATCH] Explicitly define gamepad type for console platforms --- CMake/platforms/ps4.cmake | 1 + CMake/platforms/switch.cmake | 1 + CMake/platforms/uwp_lib.cmake | 1 + CMake/platforms/vita.cmake | 1 + 4 files changed, 4 insertions(+) diff --git a/CMake/platforms/ps4.cmake b/CMake/platforms/ps4.cmake index 13a8bd7f3..43cf6f620 100644 --- a/CMake/platforms/ps4.cmake +++ b/CMake/platforms/ps4.cmake @@ -5,6 +5,7 @@ set(UBSAN OFF) SET(DISABLE_LTO ON) set(NONET ON) set(NOEXIT ON) +set(DEVILUTIONX_GAMEPAD_TYPE PlayStation) set(BUILD_ASSETS_MPQ ON) # Packbrew SDK provides SDL_image, but FindSDL2_image() fails to diff --git a/CMake/platforms/switch.cmake b/CMake/platforms/switch.cmake index 54380c7ee..a19be5be0 100644 --- a/CMake/platforms/switch.cmake +++ b/CMake/platforms/switch.cmake @@ -9,6 +9,7 @@ set(DEVILUTIONX_SYSTEM_SDL_IMAGE OFF) set(DEVILUTIONX_SYSTEM_LIBSODIUM OFF) set(DISABLE_ZERO_TIER ON) set(PREFILL_PLAYER_NAME ON) +set(DEVILUTIONX_GAMEPAD_TYPE Nintendo) set(NOEXIT ON) set(JOY_BUTTON_DPAD_LEFT 16) diff --git a/CMake/platforms/uwp_lib.cmake b/CMake/platforms/uwp_lib.cmake index 4f93f528a..2705fa281 100644 --- a/CMake/platforms/uwp_lib.cmake +++ b/CMake/platforms/uwp_lib.cmake @@ -3,6 +3,7 @@ set(UBSAN OFF) set(BUILD_ASSETS_MPQ OFF) set(BUILD_TESTING OFF) set(DISCORD_INTEGRATION OFF) +set(DEVILUTIONX_GAMEPAD_TYPE Xbox) # setting all libs to be built statically and from source set(DEVILUTIONX_SYSTEM_SDL2 OFF) diff --git a/CMake/platforms/vita.cmake b/CMake/platforms/vita.cmake index 29ab94537..656ef81e4 100644 --- a/CMake/platforms/vita.cmake +++ b/CMake/platforms/vita.cmake @@ -6,6 +6,7 @@ set(DEVILUTIONX_SYSTEM_LIBSODIUM OFF) set(BUILD_TESTING OFF) set(DISABLE_ZERO_TIER ON) set(PREFILL_PLAYER_NAME ON) +set(DEVILUTIONX_GAMEPAD_TYPE PlayStation) set(NOEXIT ON) list(APPEND DEVILUTIONX_PLATFORM_SUBDIRECTORIES platform/vita)