Merge pull request #4 from zoltanvb/input_test_driver

Input test driver
zoltanvb · Jun 23, 2024 · 5d65ee6 · 5d65ee6
2 parents 7da8e28 + c23f69b
commit 5d65ee6
Show file tree

Hide file tree

Showing 10 changed files with 498 additions and 19 deletions.
diff --git a/Makefile.common b/Makefile.common
@@ -2445,6 +2445,7 @@ endif
 ifeq ($(HAVE_TEST_DRIVERS), 1)
   DEFINES += -DHAVE_TEST_DRIVERS
   OBJ += input/drivers_joypad/test_joypad.o
+  OBJ += input/drivers/test_input.o
 endif
 
 

diff --git a/configuration.c b/configuration.c
@@ -1669,7 +1669,8 @@ static struct config_path_setting *populate_settings_path(
 #endif
 
 #ifdef HAVE_TEST_DRIVERS
-   SETTING_PATH("test_input_file_joypad",        settings->paths.test_input_file_joypad, false, NULL, true);
+   SETTING_PATH("test_input_file_joypad",        settings->paths.test_input_file_joypad,  false, NULL, true);
+   SETTING_PATH("test_input_file_general",       settings->paths.test_input_file_general, false, NULL, true);
 #endif
 
    SETTING_ARRAY("log_dir",                      settings->paths.log_dir, true, NULL, true);

diff --git a/configuration.h b/configuration.h
@@ -577,6 +577,7 @@ typedef struct settings
 #endif
 #ifdef HAVE_TEST_DRIVERS
       char test_input_file_joypad[PATH_MAX_LENGTH];
+      char test_input_file_general[PATH_MAX_LENGTH];
 #endif
       char log_dir[PATH_MAX_LENGTH];
       char app_icon[PATH_MAX_LENGTH];

diff --git a/griffin/griffin.c b/griffin/griffin.c
@@ -733,6 +733,7 @@ INPUT
 
 #ifdef HAVE_TEST_DRIVERS
 #include "../input/drivers_joypad/test_joypad.c"
+#include "../input/drivers/test_input.c"
 #endif
 
 /*============================================================