Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix mac build

Browse Source
This commit is contained in:
Erwin Coumans
2014-08-20 17:24:12 -07:00
parent cb55f7df30
commit ed637a6942
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Demos/OpenGL/GLDebugFont.cpp
View File

@@ -14,9 +14,8 @@ subject to the following restrictions:
*/ */
#include "GLDebugFont.h" #include "GLDebugFont.h"
#include "OpenGLWindow/OpenGLInclude.h"
#ifdef DONT_USE_GLUT #ifdef DONT_USE_GLUT
#include "OpenGLWindow/OpenGLInclude.h"
#else #else
#ifdef _WIN32//for glut.h #ifdef _WIN32//for glut.h
#include <windows.h> #include <windows.h>

2
Demos3/BasicDemoCustomOpenGL2/premake4.lua
View File

@@ -8,7 +8,7 @@ project "App_BasicDemoCustomOpenGL2"
"../../btgui" "../../btgui"
} }
defines { "DONT_USE_GLUT"} defines { "DONT_USE_GLUT", "USE_OPENGL2"}
initOpenGL() initOpenGL()
initGlew() initGlew()

4
btgui/OpenGLWindow/OpenGLInclude.h
View File

@@ -24,7 +24,11 @@ subject to the following restrictions:
//#include <OpenGL/gl.h> //#include <OpenGL/gl.h>
//#include <OpenGL/glu.h> //#include <OpenGL/glu.h>
//#import <Cocoa/Cocoa.h> //#import <Cocoa/Cocoa.h>
#ifdef USE_OPENGL2
#include <OpenGL/gl.h>
#else
#include <OpenGL/gl3.h> #include <OpenGL/gl3.h>
#endif
#else #else
#include "GlewWindows/GL/glew.h" #include "GlewWindows/GL/glew.h"