fix cmake build

2015-01-27 13:09:39 -08:00
parent bd16df8dd6
commit 2a1ac61c4d
2 changed files with 2 additions and 1 deletions
--- a/btgui/OpenGLWindow/CMakeLists.txt
+++ b/btgui/OpenGLWindow/CMakeLists.txt
@@ -1,6 +1,7 @@

 INCLUDE_DIRECTORIES(
 	..
+	../../src
 )

 FILE(GLOB OpenGLWindow_HDRS "*.h" )
--- a/btgui/OpenGLWindow/GLInstancingRenderer.cpp
+++ b/btgui/OpenGLWindow/GLInstancingRenderer.cpp
@@ -27,7 +27,7 @@ float MOUSE_MOVE_MULTIPLIER = 0.4f;

 #include "OpenGLInclude.h"
 #include "b3gWindowInterface.h"
-#include "Bullet3Common/b3MinMax.h"
+//#include "Bullet3Common/b3MinMax.h"

 #ifndef __APPLE__
 #ifndef glVertexAttribDivisor