UnrealXR/raylib
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Corrected issue with GetWindowHandle()

Browse source 
Not supported for the moment, issues with Linux (symbol `Font` redefined) and OSX (NSGL type redefined)
This commit is contained in:
Ray 2018-10-08 13:14:15 +02:00
parent 2feea87b61
commit ca1e309d9d
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/core.c
View file

@ -147,11 +147,11 @@
#if defined(_WIN32) #if defined(_WIN32)
#define GLFW_EXPOSE_NATIVE_WIN32 #define GLFW_EXPOSE_NATIVE_WIN32
#elif defined(__linux__) #elif defined(__linux__)
#define GLFW_EXPOSE_NATIVE_X11 //#define GLFW_EXPOSE_NATIVE_X11 // WARNING: Exposing Xlib.h > X.h results in dup symbols for Font type
//GLFW_EXPOSE_NATIVE_WAYLAND //GLFW_EXPOSE_NATIVE_WAYLAND
//GLFW_EXPOSE_NATIVE_MIR //GLFW_EXPOSE_NATIVE_MIR
#elif defined(__APPLE__) #elif defined(__APPLE__)
#define GLFW_EXPOSE_NATIVE_COCOA //#define GLFW_EXPOSE_NATIVE_COCOA // WARNING: NSGL typedef redefinition with different types ('struct objc_object *' vs 'void *') > glfw3native issue?
#endif #endif
#include <GLFW/glfw3native.h> // WARNING: It requires customization to avoid windows.h inclusion! #include <GLFW/glfw3native.h> // WARNING: It requires customization to avoid windows.h inclusion!
@ -813,11 +813,11 @@ void *GetWindowHandle(void)
// NOTE: Returned handle is: unsigned long Window (X.h) // NOTE: Returned handle is: unsigned long Window (X.h)
// typedef unsigned long XID; // typedef unsigned long XID;
// typedef XID Window; // typedef XID Window;
unsigned long id = (unsigned long)glfwGetX11Window(window); //unsigned long id = (unsigned long)glfwGetX11Window(window);
return NULL; // TODO: Find a way to return value... cast to void *? return NULL; // TODO: Find a way to return value... cast to void *?
#elif defined(__APPLE__) #elif defined(__APPLE__)
// NOTE: Returned handle is: void *id // NOTE: Returned handle is: void *id
return glfwGetCocoaWindow(window); return NULL; //glfwGetCocoaWindow(window);
#else #else
return NULL; return NULL;
#endif #endif