From 70aa6f5da52762e192adc44984dfd7bb44fea5da Mon Sep 17 00:00:00 2001 From: Milan Nikolic Date: Mon, 8 Oct 2018 19:36:48 +0200 Subject: [PATCH] Fix windows build --- raylib/external/glfw/include/GLFW/glfw3native.h | 7 ++++++- raylib/external/stb_vorbis.c | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/raylib/external/glfw/include/GLFW/glfw3native.h b/raylib/external/glfw/include/GLFW/glfw3native.h index 4372cb7..84bb339 100644 --- a/raylib/external/glfw/include/GLFW/glfw3native.h +++ b/raylib/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__) diff --git a/raylib/external/stb_vorbis.c b/raylib/external/stb_vorbis.c index 4b72504..c847242 100644 --- a/raylib/external/stb_vorbis.c +++ b/raylib/external/stb_vorbis.c @@ -193,7 +193,7 @@ #undef __forceinline #endif #define __forceinline - #define alloca __builtin_alloca + //#define alloca __builtin_alloca #elif !defined(_MSC_VER) #if __GNUC__ #define __forceinline inline