From 2feea87b616292b5bce4454a42c2d048f1cce7d8 Mon Sep 17 00:00:00 2001 From: Ray Date: Mon, 8 Oct 2018 12:29:02 +0200 Subject: Multiple changes, check description REVIEW: Reorganized global variables for consistency ADDED: GetWindowHandle() to get native window handle ADDED: GetDirectoryFiles() to get files list for a DIR --- src/external/glfw/include/GLFW/glfw3native.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/external') diff --git a/src/external/glfw/include/GLFW/glfw3native.h b/src/external/glfw/include/GLFW/glfw3native.h index 4372cb76..84bb3399 100644 --- a/src/external/glfw/include/GLFW/glfw3native.h +++ b/src/external/glfw/include/GLFW/glfw3native.h @@ -90,7 +90,12 @@ extern "C" { #undef APIENTRY #undef GLFW_APIENTRY_DEFINED #endif - #include +// RAY: Actually, only HWND handler needs to be defined +// Including windows.h could suppose symbols re-definition issues (i.e Rectangle type) +//#include + typedef void *PVOID; + typedef PVOID HANDLE; + typedef HANDLE HWND; #elif defined(GLFW_EXPOSE_NATIVE_COCOA) #include #if defined(__OBJC__) -- cgit v1.2.3