townforge/tb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Moved GLFW defines to makefile (linux/mac).

Browse Source
This commit is contained in:
Emil Segerås 2014-04-21 14:45:34 +02:00
parent e690e301c4
commit d6c9c0b720
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Demo/config.h
View File

@ -4,13 +4,6 @@
// This sucks, we need to define this to be able to build glfw without
// an extra step after checkout (to generate config.h using cmake).
#ifdef MACOSX
# define _GLFW_NSGL
#else
# define _GLFW_X11_GLX
# define _GLFW_HAS_GLXGETPROCADDRESS
#endif
#define _GLFW_VERSION_FULL "3.0.1"
#endif // DEMO_CONFIG_H

8
Makefile
View File

@ -15,12 +15,12 @@ else
endif
ifeq ($(UNAME),Darwin)
CFLAGS += -DMACOSX -Dnullptr=0 -D_GLFW_COCOA
CXXFLAGS += -DMACOSX -Dnullptr=0 -D_GLFW_COCOA
CFLAGS += -DMACOSX -Dnullptr=0 -D_GLFW_COCOA -D_GLFW_NSGL
CXXFLAGS += -DMACOSX -Dnullptr=0 -D_GLFW_COCOA -D_GLFW_NSGL
LIBS += -framework OpenGL -framework AppKit -framework IOKit -lobjc
else
CFLAGS += -DLINUX -Dnullptr=0 -D_GLFW_X11
CXXFLAGS += -DLINUX -Dnullptr=0 --std=c++0x -D_GLFW_X11
CFLAGS += -DLINUX -Dnullptr=0 -D_GLFW_X11 -D_GLFW_HAS_GLXGETPROCADDRESS
CXXFLAGS += -DLINUX -Dnullptr=0 --std=c++0x -D_GLFW_X11 -D_GLFW_HAS_GLXGETPROCADDRESS
LIBS += -lGL -lX11 -lXxf86vm -lpthread -lXrandr -lXi
endif