Skip to content

Commit

Permalink
Compile with a GLFW type
Browse files Browse the repository at this point in the history
  • Loading branch information
@marcomorain
marcomorain committed Dec 29, 2013
1 parent 61a1586 commit febc5eb
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 0 deletions.
2 changes: 2 additions & 0 deletions WinQuake/gl_vidglfw.c
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include <stdarg.h>
#include <stdio.h>
#include <signal.h>
#include <GLFW/glfw3.h>
#include "quakedef.h"

float gldepthmin, gldepthmax;
Expand All @@ -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)
{
Expand Down
10 changes: 10 additions & 0 deletions WinQuake/osx/osx.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -787,13 +787,23 @@
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;
};
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;
Expand Down

2 comments on commit febc5eb

@wyatt8740
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried to compile this on my 2006 iMac last night. It runs 10.6 snow leopard and XCode 4.2. It complained about the architecture of my glfw build, and I could not get it to compile for i386. Do you happen to know what I'm doing wrong?
I'm pretty sure it's all CMake's fault. How did you install glfw?
I already have my own version working on linux, I just want it to work in all the major OSes. (I haven't tested on BSD yet. Do you think your version of this would compile on BSD or Linux with some makefile editing?)

@marcomorain
Copy link
Owner Author

@marcomorain marcomorain commented on febc5eb Jan 7, 2014 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.