Sam Lantinga 1 vuosi sitten
vanhempi
commit
ca3b8fe91d

+ 1 - 1
src/joystick/SDL_gamecontroller.c

@@ -823,7 +823,7 @@ SDL_COMPILE_TIME_ASSERT(map_StringForGameControllerType, SDL_arraysize(map_Strin
 /*
  * convert a string to its enum equivalent
  */
-static SDL_GameControllerType SDL_GetGameControllerTypeFromString(const char *str)
+SDL_GameControllerType SDL_GetGameControllerTypeFromString(const char *str)
 {
     int i;
 

+ 3 - 0
src/joystick/SDL_joystick_c.h

@@ -262,6 +262,9 @@ extern void SDL_LoadVIDPIDListFromHints(SDL_vidpid_list *list, const char *inclu
 extern SDL_bool SDL_VIDPIDInList(Uint16 vendor_id, Uint16 product_id, const SDL_vidpid_list *list);
 extern void SDL_FreeVIDPIDList(SDL_vidpid_list *list);
 
+/* This is in SDL_gamecontroller.c */
+extern SDL_GameControllerType SDL_GetGameControllerTypeFromString(const char *str);
+
 /* Ends C function definitions when using C++ */
 #ifdef __cplusplus
 }

+ 0 - 2
src/joystick/SDL_steam_virtual_gamepad.c

@@ -34,8 +34,6 @@
 
 #define SDL_HINT_STEAM_VIRTUAL_GAMEPAD_INFO_FILE    "SteamVirtualGamepadInfo"
 
-extern SDL_GameControllerType SDL_GetGameControllerTypeFromString(const char *str);
-
 static char *SDL_steam_virtual_gamepad_info_file SDL_GUARDED_BY(SDL_joystick_lock) = NULL;
 static Uint64 SDL_steam_virtual_gamepad_info_file_mtime SDL_GUARDED_BY(SDL_joystick_lock) = 0;
 static Uint32 SDL_steam_virtual_gamepad_info_check_time SDL_GUARDED_BY(SDL_joystick_lock) = 0;