AuroraMiddleware/bullet3
1
0
Fork 0
mirror of https://github.com/bulletphysics/bullet3 synced 2024-12-13 21:30:09 +00:00
Code Issues Releases Wiki Activity

allow to build GLFW version of Bullet examples on Linux (use premake4_linux --enable_glfw gmake)

Browse Source
This commit is contained in:
Erwin Coumans 2018-02-20 16:21:22 -08:00
parent 01f58f8f02
commit 8bb40b632b
5 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build3/premake4.lua
View File

@ -339,6 +339,10 @@ end
end end
function initGlew() function initGlew()
end end
function initX11()
links {"X11", "dl","pthread"}
end
else else
dofile ("findOpenGLGlewGlut.lua") dofile ("findOpenGLGlewGlut.lua")

BIN
data/multibody.bullet
View File

Binary file not shown.

2
examples/OpenGLWindow/SimpleOpenGL2App.cpp
View File

@ -139,8 +139,10 @@ SimpleOpenGL2App::SimpleOpenGL2App(const char* title, int width, int height)
#ifndef NO_GLEW #ifndef NO_GLEW
#ifndef __APPLE__ #ifndef __APPLE__
#ifndef _WIN32 #ifndef _WIN32
#ifndef B3_USE_GLFW
//some Linux implementations need the 'glewExperimental' to be true //some Linux implementations need the 'glewExperimental' to be true
glewExperimental = GL_TRUE; glewExperimental = GL_TRUE;
#endif//B3_USE_GLFW
#endif //_WIN32 #endif //_WIN32
#ifndef B3_USE_GLFW #ifndef B3_USE_GLFW

2
examples/OpenGLWindow/SimpleOpenGL3App.cpp
View File

@ -324,8 +324,10 @@ SimpleOpenGL3App::SimpleOpenGL3App( const char* title, int width,int height, boo
#ifndef NO_GLEW #ifndef NO_GLEW
#ifndef __APPLE__ #ifndef __APPLE__
#ifndef _WIN32 #ifndef _WIN32
#ifndef B3_USE_GLFW
//some Linux implementations need the 'glewExperimental' to be true //some Linux implementations need the 'glewExperimental' to be true
glewExperimental = GL_TRUE; glewExperimental = GL_TRUE;
#endif //B3_USE_GLFW
#endif //_WIN32 #endif //_WIN32
#ifndef B3_USE_GLFW #ifndef B3_USE_GLFW

4
examples/OpenGLWindow/X11OpenGLWindow.cpp
View File

@ -1,3 +1,6 @@
#ifndef B3_USE_GLFW
#include "X11OpenGLWindow.h" #include "X11OpenGLWindow.h"
#include "OpenGLInclude.h" #include "OpenGLInclude.h"
@ -1121,3 +1124,4 @@ int X11OpenGLWindow::fileOpenDialog(char* filename, int maxNameLength)
return len; return len;
} }
#endif