use only input module from glfw on mac

Author: nesbox

cmake/sokol.cmake

@@ -29,14 +29,17 @@ if(APPLE)
 
     target_link_libraries(sokol PRIVATE
         "-framework Cocoa"
+        "-framework IOKit"
         "-framework QuartzCore"
         "-framework Metal"
         "-framework MetalKit"
         "-framework AudioToolbox"
-        "-framework GameController"
-        glfw
     )
 
+    target_include_directories(sokol PRIVATE 
+        ${THIRDPARTY_DIR}/glfw/src
+        ${THIRDPARTY_DIR}/glfw/include)
+
 elseif(LINUX)
     target_link_libraries(sokol PRIVATE X11 GL Xi Xcursor m dl asound glfw)
 elseif(WIN32)

src/system/sokol/main.c

@@ -687,6 +687,7 @@ static void cleanup(void *userdata)
 
     free(app);
 
+    sgamepad_shutdown();
     sgl_shutdown();
     sg_shutdown();
     saudio_shutdown();

src/system/sokol/sokol_gamepad.h

@@ -78,6 +78,8 @@ extern "C" {
 
     SOKOL_API_DECL void sgamepad_init();
 
+    SOKOL_API_DECL void sgamepad_shutdown();
+
     SOKOL_API_DECL void sgamepad_record_state();
 
     SOKOL_API_DECL void sgamepad_get_gamepad_state(unsigned int index, sgamepad_gamepad_state* pstate);
@@ -186,14 +188,13 @@ _SOKOL_PRIVATE void _sgamepad_generate_analog_stick_state(float x_value, float y
 /*== PLATFORM SPECIFIC INCLUDES AND DEFINES ==================================*/
 #if defined (_SAPP_WIN32) || defined(_SAPP_APPLE) || defined(_SAPP_LINUX)
     #include <GLFW/glfw3.h>
+    #define SGAMEPAD_MAX_SUPPORTED_GAMEPADS 4
 #else
     #define SGAMEPAD_MAX_SUPPORTED_GAMEPADS 0
 #endif
 
-#define SGAMEPAD_MAX_SUPPORTED_GAMEPADS 4
-
 typedef struct sgamepad {
-    sgamepad_gamepad_state gamepad_states[SGAMEPAD_MAX_SUPPORTED_GAMEPADS];
+    sgamepad_gamepad_state gamepad_states[4];
 } sgamepad;
 
 _SOKOL_PRIVATE sgamepad _sgamepad = {0};
@@ -251,13 +252,65 @@ SOKOL_API_IMPL unsigned int sgamepad_get_max_supported_gamepads() {
     return SGAMEPAD_MAX_SUPPORTED_GAMEPADS;
 }
 
-SOKOL_API_IMPL void sgamepad_init() {
+#if defined (_SAPP_WIN32) || defined(_SAPP_LINUX)
 
-#if defined (_SAPP_WIN32) || defined(_SAPP_APPLE) || defined(_SAPP_LINUX)
+SOKOL_API_IMPL void sgamepad_init() {
     glfwInit();
-#endif
 }
 
+SOKOL_API_IMPL void sgamepad_shutdown() {
+
+    glfwTerminate();
+}
+
+#elif defined(_SAPP_APPLE)
+
+static void* _glfw_calloc(size_t count, size_t size)
+{
+    return calloc(count, size);
+}
+
+static void* _glfw_realloc(void* block, size_t size)
+{
+    return realloc(block, size);
+}
+
+static void _glfw_free(void* block)
+{
+    free(block);
+}
+
+#define _GLFW_COCOA
+#include "cocoa_joystick.m"
+#include "cocoa_time.c"
+#include "input.c"
+
+_GLFWlibrary _glfw = { GLFW_TRUE };
+
+void _glfwInputError(int code, const char* format, ...)
+{}
+
+SOKOL_API_IMPL void sgamepad_init() {
+
+    _glfw.platform = (_GLFWplatform)
+    {
+        .initJoysticks = _glfwInitJoysticksCocoa,
+        .terminateJoysticks = _glfwTerminateJoysticksCocoa,
+        .pollJoystick = _glfwPollJoystickCocoa,
+        .getMappingName = _glfwGetMappingNameCocoa,
+        .updateGamepadGUID = _glfwUpdateGamepadGUIDCocoa,
+    };
+
+    _glfwInitGamepadMappings();
+}
+
+SOKOL_API_IMPL void sgamepad_shutdown() {
+
+    _glfwTerminateJoysticksCocoa();
+}
+
+#endif
+
 SOKOL_API_IMPL void sgamepad_record_state() {
     memset(_sgamepad.gamepad_states, 0, sizeof(_sgamepad.gamepad_states));
     _sgamepad_record_state();