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

CMake: remove CMAKE_INSTALL_PREFIX from CMakeLists.txt it is automagically used

Browse Source 
See also https://github.com/bulletphysics/bullet3/pull/227
remove pthread from OpenGL/GlutStuff.cpp for now (it breaks CMake build)
This commit is contained in:
Erwin Coumans
2014-08-31 12:36:02 -07:00
parent f199a4a972
commit ec3650acc4
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Demos/OpenGL/GlutStuff.cpp
View File

@@ -19,7 +19,7 @@ subject to the following restrictions:
#if !defined(_WIN32) && !defined(__APPLE__)
//assume linux workaround
#include <pthread.h>
//#include <pthread.h>
#endif
//glut is C code, this global gDemoApplication links glut to the C++ demo
@@ -86,8 +86,8 @@ int glutmain(int argc, char **argv,int width,int height,const char* title,DemoAp
//Access pthreads as a workaround for a bug in Linux/Ubuntu
//See https://bugs.launchpad.net/ubuntu/+source/nvidia-graphics-drivers-319/+bug/1248642
int i=pthread_getconcurrency();
printf("pthread_getconcurrency()=%d\n",i);
// int i=pthread_getconcurrency();
// printf("pthread_getconcurrency()=%d\n",i);
#endif
glutInit(&argc, argv);