Merge branch 'master' into EGL

2026-09-22 16:52:57 +00:00 · 2012-12-02 17:11:17 +01:00
parent 280782a2a5 20c891f566
commit 14e71833bd
10 changed files with 114 additions and 15 deletions
@@ -285,6 +285,7 @@ const char* _glfwPlatformGetClipboardString(_GLFWwindow* window);
 int _glfwPlatformGetJoystickParam(int joy, int param);
 int _glfwPlatformGetJoystickAxes(int joy, float* axes, int numaxes);
 int _glfwPlatformGetJoystickButtons(int joy, unsigned char* buttons, int numbuttons);
+const char* _glfwPlatformGetJoystickName(int joy);

 // Time input
 double _glfwPlatformGetTime(void);