From febc5ebb3828e4ffcf236c10a46c96545770a944 Mon Sep 17 00:00:00 2001 From: Marc O'Morain Date: Sun, 29 Dec 2013 16:15:02 +0000 Subject: [PATCH] Compile with a GLFW type --- WinQuake/gl_vidglfw.c | 2 ++ WinQuake/osx/osx.xcodeproj/project.pbxproj | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/WinQuake/gl_vidglfw.c b/WinQuake/gl_vidglfw.c index cfbfdd354..bd007737e 100644 --- a/WinQuake/gl_vidglfw.c +++ b/WinQuake/gl_vidglfw.c @@ -1,6 +1,7 @@ #include #include #include +#include #include "quakedef.h" float gldepthmin, gldepthmax; @@ -14,6 +15,7 @@ cvar_t gl_ztrick = {"gl_ztrick","1"}; unsigned d_8to24table[256]; unsigned char d_15to8table[65536]; +static GLFWwindow* window = NULL; void D_BeginDirectRect (int x, int y, byte *pbitmap, int width, int height) { diff --git a/WinQuake/osx/osx.xcodeproj/project.pbxproj b/WinQuake/osx/osx.xcodeproj/project.pbxproj index 7ef430e96..ddc5a42c9 100644 --- a/WinQuake/osx/osx.xcodeproj/project.pbxproj +++ b/WinQuake/osx/osx.xcodeproj/project.pbxproj @@ -787,6 +787,11 @@ 8F9898DB18704F81003F5893 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + HEADER_SEARCH_PATHS = ( + "$(inherited)", + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, + "/usr/local//Cellar/glfw3/3.0.3/include/", + ); PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -794,6 +799,11 @@ 8F9898DC18704F81003F5893 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + HEADER_SEARCH_PATHS = ( + "$(inherited)", + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, + "/usr/local//Cellar/glfw3/3.0.3/include/", + ); PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release;