Fix dpad when using gamepads

blockattack · Jan 20, 2025 · 8d54d0e · 8d54d0e
1 parent 9a9a96a
commit 8d54d0e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/source/code/gamecontroller.cpp b/source/code/gamecontroller.cpp
@@ -214,7 +214,7 @@ bool GameControllerIsLeftEvent(const SDL_Event& event) {
 }
 
 bool GameControllerIsRightEvent(const SDL_Event& event) {
-	return GameControllerIsControllerDirectionEvent(event, SDL_CONTROLLER_BUTTON_DPAD_LEFT, SDL_CONTROLLER_AXIS_LEFTX);
+	return GameControllerIsControllerDirectionEvent(event, SDL_CONTROLLER_BUTTON_DPAD_RIGHT, SDL_CONTROLLER_AXIS_LEFTX);
 }
 
 bool GameControllerExtIsPlayerUpEvent(int playerNumber, const SDL_Event& event) {

diff --git a/source/misc/docker/Dockerfile.WindoesBuild b/source/misc/docker/Dockerfile.WindoesBuild
@@ -11,9 +11,9 @@ COPY . /staging/blockattack-game
 ENV BLOCKATTACK_VERSION 2.10.0-SNAPSHOT
 
 RUN cd /staging/blockattack-game && \
-./packdata.sh && \
-i686-w64-mingw32.static-cmake . && \
-make && \
+./packdata.sh && ls -lrt source/misc/embedded_libs/fmt-11.0.2 && \
+x86_64-w64-mingw32.static-cmake . && \
+make clean && make && \
 cd windows\ installer/ && \
 makensis install_script.nsi && \
 mv Setup.exe /output/blockattack-installer-${BLOCKATTACK_VERSION}.exe && \

diff --git a/source/misc/embedded_libs/PlatformFolders-4.2.0/CMakeLists.txt b/source/misc/embedded_libs/PlatformFolders-4.2.0/CMakeLists.txt
@@ -1,5 +1,5 @@
 # For target_compile_features
-cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.5.1...3.28.3 FATAL_ERROR)
 
 set(PLATFORMFOLDERS_MAIN_PROJECT OFF)
 if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)