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

Remove @workaround for sticky convex collisions in btGjkPairDetector, it suffers from many artifacts,

Browse Source 
We still need to do more work on GJK when using very small collision margins...
Fix premake build on Windows
This commit is contained in:
Erwin Coumans
2014-05-15 22:55:54 -07:00
parent 73c5d49434
commit 7f3cbc066f
2 changed files with 14 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Demos/premake4.lua
View File

@@ -18,16 +18,17 @@ function createDemos( demos, incdirs, linknames)
configuration { "Windows" }
defines { "GLEW_STATIC"}
links { "opengl32" }
includedirs{ "../Glut" }
libdirs {"../Glut"}
files { "../build/bullet.rc" }
links { "opengl32","glu32","winmm"}
includedirs{ "Glut" }
libdirs {"Glut"}
files { "../build3/bullet.rc" }
configuration {"Windows", "x32"}
links {"glew32s","glut32"}
configuration {"Windows", "x64"}
links {"glew64s", "glut64"}
configuration {"MacOSX"}
--print "hello"
linkoptions { "-framework Carbon -framework OpenGL -framework AGL -framework Glut" }