Add game controller mappings from SDL_GameControllerDB

Author: lazd

Makefile

@@ -1,7 +1,6 @@
 CONFIG ?= config.default
 -include $(CONFIG)
 
-
 BINARY    ?= wolf3d
 PREFIX    ?= /usr/local
 DATADIR   ?= $(PREFIX)/share/games/wolf3d/
@@ -44,6 +43,31 @@ CCFLAGS += -Wsequence-point
 
 CXXFLAGS += $(CFLAGS)
 
+# Add controller mappings
+define DOUBLESPACE
+  
+endef
+define SINGLESPACE
+ 
+endef
+define SDLDELIMITER
+, 
+endef
+define SDLNEWLINE
+,\n
+endef
+define SDLGREPUNIX
+grep -v '^#' SDL_GameControllerDB/gamecontrollerdb.txt
+endef
+define SDLGREPWINDOWS
+findstr /B /V # SDL_GameControllerDB/gamecontrollerdb.txt
+endef
+SDLGREPCMD := $(if $(filter $(OS),Windows_NT),$(SDLGREPWINDOWS),$(SDLGREPUNIX))
+SDLMAPPINGS := $(shell $(SDLGREPCMD))
+SDLMAPPINGS := $(subst $(DOUBLESPACE),$(SINGLESPACE),${SDLMAPPINGS})
+SDLMAPPINGS := $(subst $(SDLDELIMITER),$(SDLNEWLINE),${SDLMAPPINGS})
+CXXFLAGS += -DSDLMAPPINGS="\"$(SDLMAPPINGS)\""
+
 LDFLAGS += $(LDFLAGS_SDL)
 LDFLAGS += -lSDL2_mixer
 ifneq (,$(findstring MINGW,$(shell uname -s)))

id_in.cpp

@@ -412,6 +412,16 @@ IN_Startup(void)
     // Manually work around RetroPi's funky xpad triggers_to_buttons bit
     SDL_GameControllerAddMapping("030000005e040000dd02000003020000,Microsoft X-Box One pad (Firmware 2015),platform:Linux,a:b0,b:b1,x:b2,y:b3,back:b8,guide:b10,start:b9,leftstick:b11,rightstick:b12,leftshoulder:b4,rightshoulder:b5,dpup:h0.1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b6,righttrigger:b7");
 
+    // Add passed-in controller mappings
+    char str[] = SDLMAPPINGS;
+    char * pch;
+    pch = strtok (str,"\n");
+    while (pch != NULL)
+    {
+        SDL_GameControllerAddMapping(pch);
+        pch = strtok (NULL, "\n");
+    }
+
 	if (IN_Started)
 		return;