Avoid multiple gl.h inclusions
Expose native Cocoa Window again...
This commit is contained in:
parent
81d28c5784
commit
2652e7d1c1
1 changed files with 9 additions and 5 deletions
5
src/external/glfw/include/GLFW/glfw3native.h
vendored
5
src/external/glfw/include/GLFW/glfw3native.h
vendored
|
|
@ -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>
|
||||
|
|
|
|||
Loading…
Reference in a new issue