Load gamecontrollerdb.txt from data dir, add a default one

ChristopherHX · Nov 22, 2018 · 5127a58 · 5127a58
1 parent 22c0996
commit 5127a58
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -42,7 +42,7 @@ endif()
 
 option(ENABLE_DEV_PATHS "Enables lookup in source directories for misc files required by the launcher. This should be disabled for package builds." ON)
 if (ENABLE_DEV_PATHS)
-    add_definitions(-DDEV_EXTRA_PATHS="${NATIVES_PATH_DIR}")
+    add_definitions(-DDEV_EXTRA_PATHS="${NATIVES_PATH_DIR}:${CMAKE_BINARY_DIR}/gamecontrollerdb")
 endif()
 
 option(USE_OWN_CURL "Builds CURL as an ExternalProject dependency" OFF)
@@ -52,6 +52,11 @@ endif()
 
 include(ext/json.cmake)
 
+option(USE_GAMECONTROLLERDB "Downloads gamecontrollerdb.txt from gabomdq/SDL_GameControllerDB" ON)
+if (USE_GAMECONTROLLERDB)
+    include(ext/gamepad_mappings.cmake)
+endif()
+
 if (BUILD_CLIENT)
     include(game-window/BuildSettings.cmake)
     if (GAMEWINDOW_SYSTEM STREQUAL "EGLUT")

diff --git a/ext/gamepad_mappings.cmake b/ext/gamepad_mappings.cmake
@@ -0,0 +1,18 @@
+include(ExternalProject)
+
+set(GAMECONTROLLERDB_DIR ${CMAKE_BINARY_DIR}/gamecontrollerdb)
+
+ExternalProject_Add(
+        gamecontrollerdb
+        DOWNLOAD_DIR ${GAMECONTROLLERDB_DIR}
+        URL "https://raw.githubusercontent.com/gabomdq/SDL_GameControllerDB/master/gamecontrollerdb.txt"
+        "https://raw.githubusercontent.com/gabomdq/SDL_GameControllerDB/master/LICENSE"
+        DOWNLOAD_NO_EXTRACT TRUE
+        DOWNLOAD_NO_PROGRESS TRUE
+        CONFIGURE_COMMAND ""
+        BUILD_COMMAND ""
+        INSTALL_COMMAND ""
+)
+
+install(FILES ${GAMECONTROLLERDB_DIR}/gamecontrollerdb.txt COMPONENT gamepad-mappings DESTINATION share/mcpelauncher
+        PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
diff --git a/game-window b/game-window
diff --git a/mcpelauncher-client b/mcpelauncher-client
diff --git a/mcpelauncher-common b/mcpelauncher-common
+2 −0		include/game_window_manager.h
+5 −0		src/window_manager_eglut.cpp
+4 −2		src/window_manager_eglut.h
+4 −0		src/window_manager_glfw.cpp
+4 −2		src/window_manager_glfw.h
+1 −0		CPackSettings.cmake
+1 −0		src/main.cpp
+13 −0		src/window_callbacks.cpp
+2 −0		src/window_callbacks.h