fix more warnings in BulletCollision, and fix CMakeLists for Linux

2014-08-21 15:54:50 -07:00
parent 143c2da254
commit 5834547368
27 changed files with 1277 additions and 1246 deletions
--- a/Demos3/SimpleOpenGL3/CMakeLists.txt
+++ b/Demos3/SimpleOpenGL3/CMakeLists.txt
@@ -27,7 +27,15 @@ ELSE(WIN32)
 		MESSAGE(${COCOA})
 		link_libraries(${COCOA})
 	ELSE(APPLE)
-		LINK_LIBRARIES( GLEW X11 pthread dl Xext)
+
+                 INCLUDE_DIRECTORIES(
+                                ${BULLET_PHYSICS_SOURCE_DIR}/btgui/OpenGLWindow/GlewWindows
+                 )
+                ADD_DEFINITIONS("-DGLEW_INIT_OPENGL11_FUNCTIONS=1")
+                ADD_DEFINITIONS("-DGLEW_STATIC")
+                ADD_DEFINITIONS("-DGLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS=1")
+
+		LINK_LIBRARIES( X11 pthread dl Xext)
 	ENDIF(APPLE)
 ENDIF(WIN32)