glfw3.c 3.4.2 → 3.4.4

package/GLFW/glfw3.c

@@ -1,7 +1,7 @@
 // Core/Common files (always included)
 #pragma once
 
-// FIX: Define missing OCR_* constants (@wolfam77)
+// FIX: Define missing OCR_* constants (@wolfram77)
 // For some reason, including windows.h with OEMRESOURCE defined
 // does not always define these constants.
 #ifdef _GLFW_WIN32
@@ -27,7 +27,7 @@
 #endif
 #endif
 
-// Auto-link windows libraries (@wolfam77)
+// Auto-link windows libraries (@wolfram77)
 #ifdef _GLFW_WIN32
 #pragma comment(lib, "gdi32.lib")
 #pragma comment(lib, "user32.lib")
@@ -46,7 +46,7 @@
 #include "window.c"
 
 // Null platform (for unsupported platforms)
-// FIX: Avoid including null platform when not needed (@wolfam77)
+// FIX: Avoid including null platform when not needed (@wolfram77)
 #if !defined(_GLFW_WIN32) && !defined(_GLFW_COCOA) && !defined(_GLFW_X11) && !defined(_GLFW_WAYLAND)
 #include "null_init.c"
 #include "null_joystick.c"

package/GLFW/internal.h

@@ -46,7 +46,7 @@
 #endif
 
 #define GLFW_INCLUDE_NONE
-#include "glfw3.h"  // Adjust include path (@wolfam77)
+#include "glfw3.h"  // Adjust include path (@wolfram77)
 
 #define _GLFW_INSERT_FIRST      0
 #define _GLFW_INSERT_LAST       1
@@ -78,7 +78,7 @@ typedef struct _GLFWjoystick    _GLFWjoystick;
 typedef struct _GLFWtls         _GLFWtls;
 typedef struct _GLFWmutex       _GLFWmutex;
 
-// FIX: GV_NUM_EXTENSIONS is redefined, among other redefinitions (@wolfam77)
+// FIX: GV_NUM_EXTENSIONS is redefined, among other redefinitions (@wolfram77)
 #ifndef GL_VERSION
 #define GL_VERSION 0x1f02
 #endif
@@ -276,6 +276,8 @@ typedef GLFWglproc (GLAPIENTRY * PFN_OSMesaGetProcAddress)(const char*);
 #define OSMesaGetDepthBuffer _glfw.osmesa.GetDepthBuffer
 #define OSMesaGetProcAddress _glfw.osmesa.GetProcAddress
 
+// FIX: VK_NULL_HANDLE redefinition (@wolfram77)
+#ifndef VK_NULL_HANDLE
 #define VK_NULL_HANDLE 0
 
 typedef void* VkInstance;
@@ -335,12 +337,15 @@ typedef void (APIENTRY * PFN_vkVoidFunction)(void);
 
 typedef PFN_vkVoidFunction (APIENTRY * PFN_vkGetInstanceProcAddr)(VkInstance,const char*);
 typedef VkResult (APIENTRY * PFN_vkEnumerateInstanceExtensionProperties)(const char*,uint32_t*,VkExtensionProperties*);
+#endif
+#ifndef vkGetInstanceProcAddr  // This prevents redefinition errors (@wolfram77)
 #define vkGetInstanceProcAddr _glfw.vk.GetInstanceProcAddr
+#endif
 
 #include "platform.h"
 
 #define GLFW_NATIVE_INCLUDE_NONE
-#include "glfw3native.h"  // Adjust include path (@wolfam77)
+#include "glfw3native.h"  // Adjust include path (@wolfram77)
 
 // Checks for whether the library has been initialized
 #define _GLFW_REQUIRE_INIT()                         \

package/GLFW/platform.c

@@ -78,7 +78,7 @@ GLFWbool _glfwSelectPlatform(int desiredID, _GLFWplatform* platform)
     #if !defined(_GLFW_WIN32) && !defined(_GLFW_COCOA) && !defined(_GLFW_X11) && !defined(_GLFW_WAYLAND)
     if (desiredID == GLFW_PLATFORM_NULL)
         return _glfwConnectNull(desiredID, platform);
-    else  // FIX: _glfwConnectNull is not defined (@wolfam77)
+    else  // FIX: _glfwConnectNull is not defined (@wolfram77)
     #endif
     if (count == 0)
     {

package/README.md

@@ -67,33 +67,23 @@ And then include `glfw3.h` as follows:
 ```c
 // main.c
 #define GLFW_IMPLEMENTATION
-#include "node_modules/glfw.c/GLFW/glfw3.h"
+#include <GLFW/glfw3.h>
 
 int main() { /* ... */ }
 ```
 
-And then compile with `clang` or `gcc` as usual.
+Finally, compile while adding the path `node_modules/glfw.c` to your compiler's include paths.
 
 ```bash
-$ clang main.c  # or, use gcc
-$ gcc   main.c
-```
-
-You may also use a simpler approach:
-
-```c
-// main.c
-#define GLFW_IMPLEMENTATION
-#include <GLFW/glfw3.h>
-
-int main() { /* ... */ }
+$ clang -I./node_modules/glfw.c main.c  # or, use gcc
+$ gcc   -I./node_modules/glfw.c main.c
 ```
 
-If you add the path `node_modules/glfw.c` to your compiler's include paths.
+You may also use a simpler approach with the [cpoach](https://www.npmjs.com/package/cpoach.sh) tool, which automatically adds the necessary include paths of all the installed dependencies for your project.
 
 ```bash
-$ clang -I./node_modules/glfw.c main.c  # or, use gcc
-$ gcc   -I./node_modules/glfw.c main.c
+$ cpoach clang main.c  # or, use gcc
+$ cpoach gcc   main.c
 ```
 
 <br>
@@ -231,6 +221,7 @@ porting it to your favorite platform, join us on the forum or GitHub.
 <br>
 
 
+[![](https://raw.githubusercontent.com/qb40/designs/gh-pages/0/image/11.png)](https://wolfram77.github.io)<br>
 [![SRC](https://img.shields.io/badge/src-repo-green?logo=Org)](https://github.com/glfw/glfw)
 [![ORG](https://img.shields.io/badge/org-nodef-green?logo=Org)](https://nodef.github.io)
 ![](https://ga-beacon.deno.dev/G-RC63DPBH3P:SH3Eq-NoQ9mwgYeHWxu7cw/github.com/nodef/glfw.c)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "glfw3.c",
-  "version": "3.4.2",
+  "version": "3.4.4",
   "description": "A multi-platform library for OpenGL, OpenGL ES and Vulkan development on the desktop; Marcus Geelnard (2002).",
   "keywords": [
     "c",