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

add BspDemo.bsp data file

Browse Source 
add sphere2.urdf
move btSpatialAlgebra into LinearMath
remove some warnings, introduce BT_ZERO, BT_ONE, BT_HALF as defines for 0.f/0., 1.f/1., 0.5f/0.5 respectively
This commit is contained in:
erwincoumans
2015-04-16 10:17:35 -07:00
parent a1bf9c5556
commit 794c8ec064
19 changed files with 448 additions and 420 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
build3/findOpenGLGlewGlut.lua
View File

@@ -43,26 +43,6 @@
configuration{}
end
function initGlut()
configuration {}
if os.is("Windows") then
configuration {"Windows"}
includedirs {
projectRootDir .. "btgui/OpenGLWindow/Glut"
}
libdirs { projectRootDir .. "btgui/OpenGLWindow/Glut"}
configuration {"Windows", "x32"}
links {"glut32"}
configuration {"Windows", "x64"}
links {"glut64"}
end
configuration {"MacOSX"}
links { "Glut.framework" }
configuration {"Linux"}
links {"glut"}
configuration{}
end
function initGlew()
configuration {}
@@ -70,9 +50,9 @@
configuration {"Windows"}
defines { "GLEW_STATIC"}
includedirs {
projectRootDir .. "btgui/OpenGLWindow/GlewWindows"
projectRootDir .. "examples/ThirdPartyLibs/Glew"
}
files { projectRootDir .. "btgui/OpenGLWindow/GlewWindows/glew.c"}
files { projectRootDir .. "examples/ThirdPartyLibs/Glew/glew.c"}
end
if os.is("Linux") then
configuration{"Linux"}
@@ -83,9 +63,9 @@
print("Using static glew and dynamic loading of glx functions")
defines { "GLEW_STATIC","GLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS=1"}
includedirs {
projectRootDir .. "btgui/OpenGLWindow/GlewWindows"
projectRootDir .. "examples/ThirdPartyLibs/Glew"
}
files { projectRootDir .. "btgui/OpenGLWindow/GlewWindows/glew.c"}
files { projectRootDir .. "examples/ThirdPartyLibs/Glew/glew.c"}
links {"dl"}
end
@@ -100,7 +80,7 @@
else
print("No X11/X.h found, using dynamic loading of X11")
includedirs {
projectRootDir .. "btgui/OpenGLWindow/optionalX11"
projectRootDir .. "examples/ThirdPartyLibs/optionalX11"
}
defines {"DYNAMIC_LOAD_X11_FUNCTIONS"}
links {"dl","pthread"}