From 2a1ac61c4da1e1217f919f4bda21e34eb2b2069c Mon Sep 17 00:00:00 2001 From: = <=> Date: Tue, 27 Jan 2015 13:09:39 -0800 Subject: [PATCH] fix cmake build --- btgui/OpenGLWindow/CMakeLists.txt | 1 + btgui/OpenGLWindow/GLInstancingRenderer.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/btgui/OpenGLWindow/CMakeLists.txt b/btgui/OpenGLWindow/CMakeLists.txt index 57c476d8c..5d4460818 100644 --- a/btgui/OpenGLWindow/CMakeLists.txt +++ b/btgui/OpenGLWindow/CMakeLists.txt @@ -1,6 +1,7 @@ INCLUDE_DIRECTORIES( .. + ../../src ) FILE(GLOB OpenGLWindow_HDRS "*.h" ) diff --git a/btgui/OpenGLWindow/GLInstancingRenderer.cpp b/btgui/OpenGLWindow/GLInstancingRenderer.cpp index 3fbe9035b..ec2d21921 100644 --- 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