diff options
| author | Ray <[email protected]> | 2018-10-08 18:08:39 +0200 |
|---|---|---|
| committer | Ray <[email protected]> | 2018-10-08 18:08:39 +0200 |
| commit | 2652e7d1c1051852e7f2ebf0e71396ac645c6713 (patch) | |
| tree | dcd462914fc18a6557df07ec40bed353277a3009 /src | |
| parent | 81d28c5784f300b0d2437b004a09fd0fe391dda9 (diff) | |
| download | raylib-2652e7d1c1051852e7f2ebf0e71396ac645c6713.tar.gz raylib-2652e7d1c1051852e7f2ebf0e71396ac645c6713.zip | |
Avoid multiple gl.h inclusions
Expose native Cocoa Window again...
Diffstat (limited to 'src')
| -rw-r--r-- | src/core.c | 9 | ||||
| -rw-r--r-- | src/external/glfw/include/GLFW/glfw3native.h | 5 |
2 files changed, 9 insertions, 5 deletions
@@ -141,7 +141,8 @@ #endif #if defined(PLATFORM_DESKTOP) - //#define GLFW_INCLUDE_NONE // Disable the standard OpenGL header inclusion on GLFW3 + #define GLFW_INCLUDE_NONE // Disable the standard OpenGL header inclusion on GLFW3 + // NOTE: Already provided by rlgl implementation (on glad.h) #include <GLFW/glfw3.h> // GLFW3 library: Windows, OpenGL context and Input management // NOTE: GLFW3 already includes gl.h (OpenGL) headers @@ -166,7 +167,7 @@ #include <unistd.h> // Required for: usleep() #include <objc/message.h> // Required for: objc_msgsend(), sel_registerName() - //#define GLFW_EXPOSE_NATIVE_COCOA // WARNING: typedef redefinition with different types ('void *' vs 'struct objc_object *') + #define GLFW_EXPOSE_NATIVE_COCOA #define GLFW_EXPOSE_NATIVE_NSGL #include <GLFW/glfw3native.h> // Required for: glfwGetCocoaWindow(), glfwGetNSGLContext() #endif @@ -821,8 +822,8 @@ void *GetWindowHandle(void) //unsigned long id = (unsigned long)glfwGetX11Window(window); return NULL; // TODO: Find a way to return value... cast to void *? #elif defined(__APPLE__) - // NOTE: Returned handle is: void *id - return NULL; //glfwGetCocoaWindow(window); // + // NOTE: Returned handle is: (objc_object *) + return (void *)glfwGetCocoaWindow(window); #else return NULL; #endif diff --git a/src/external/glfw/include/GLFW/glfw3native.h b/src/external/glfw/include/GLFW/glfw3native.h index 84bb3399..463a7a71 100644 --- a/src/external/glfw/include/GLFW/glfw3native.h +++ b/src/external/glfw/include/GLFW/glfw3native.h @@ -101,7 +101,10 @@ extern "C" { #if defined(__OBJC__) #import <Cocoa/Cocoa.h> #else - typedef void* id; + // RAY: Added protection in case OBJC types defined + #if !defined(OBJC_TYPES_DEFINED) + typedef void* id; + #endif #endif #elif defined(GLFW_EXPOSE_NATIVE_X11) #include <X11/Xlib.h> |