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

Merge pull request #214 from erwincoumans/master

Browse Source 
fix Linux  and Cmake build
This commit is contained in:
erwincoumans 2014-08-20 16:51:02 -07:00
commit cb55f7df30
5 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Demos3/AllBullet2Demos/CMakeLists.txt
View File

@ -3,6 +3,7 @@
INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/src
${BULLET_PHYSICS_SOURCE_DIR}/btgui
${BULLET_PHYSICS_SOURCE_DIR}/btgui/lua-5.2.3/src
)
@ -12,6 +13,13 @@ SET(App_AllBullet2Demos_SRCS
BulletDemoEntries.h
GwenParameterInterface.cpp
GwenParameterInterface.h
GraphingTexture.h
GwenParameterInterface.h
GwenProfileWindow.h
GwenTextureWindow.h
GraphingTexture.cpp
GwenProfileWindow.cpp
GwenTextureWindow.cpp
../bullet2/BasicDemo/Bullet2RigidBodyDemo.cpp
../bullet2/BasicDemo/Bullet2RigidBodyDemo.h
../../Demos/BasicDemo/BasicDemoPhysicsSetup.cpp
@ -34,8 +42,8 @@ SET(App_AllBullet2Demos_SRCS
# ../bullet2/ChainDemo/ChainDemo.h
# ../bullet2/RagdollDemo/RagdollDemo.cpp
# ../bullet2/RagdollDemo/RagdollDemo.h
# ../bullet2/LuaDemo/LuaDemo.cpp
# ../bullet2/LuaDemo/LuaDemo.h
../bullet2/LuaDemo/LuaPhysicsSetup.cpp
../bullet2/LuaDemo/LuaPhysicsSetup.h
../GpuDemos/gwenUserInterface.cpp
../GpuDemos/gwenUserInterface.h
../ImportURDFDemo/ImportURDFSetup.cpp
@ -70,7 +78,7 @@ SET(App_AllBullet2Demos_SRCS
)
LINK_LIBRARIES(
Bullet3Common BulletSoftBody BulletDynamics BulletCollision LinearMath OpenGLWindow gwen ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
lua-5.2.3 Bullet3Common BulletSoftBody BulletDynamics BulletCollision LinearMath OpenGLWindow gwen ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
)
IF (WIN32)

4
Demos3/AllBullet2Demos/premake4.lua
View File

@ -44,8 +44,8 @@
"../bullet2/BasicDemo/Bullet2RigidBodyDemo.h",
"../bullet2/LuaDemo/LuaPhysicsSetup.cpp",
"../bullet2/LuaDemo/LuaPhysicsSetup.h",
"../DifferentialGearDemo/DifferentialGearSetup.cpp",
"../DifferentialGearDemo/DifferentialGearSetup.h",
-- "../DifferentialGearDemo/DifferentialGearSetup.cpp",
-- "../DifferentialGearDemo/DifferentialGearSetup.h",
"../../Demos/BasicDemo/BasicDemoPhysicsSetup.cpp",
"../../Demos/BasicDemo/BasicDemoPhysicsSetup.h",
"../../Demos/CcdPhysicsDemo/CcdPhysicsSetup.cpp",

2
btgui/CMakeLists.txt
View File

@ -1,3 +1,3 @@
if (OPENGL_FOUND)
SUBDIRS( Gwen OpenGLWindow )
SUBDIRS( Gwen OpenGLWindow lua-5.2.3)
endif(OPENGL_FOUND)

13
btgui/lua-5.2.3/CMakeLists.txt Normal file
View File

@ -0,0 +1,13 @@
INCLUDE_DIRECTORIES(
.
src
)
FILE(GLOB_RECURSE lua-5.2.3_SRCS "src/*.c")
ADD_DEFINITIONS(-DLUA_COMPAT_ALL)
FILE(GLOB_RECURSE lua-5.2.3_HDRS "src/*.h")
ADD_LIBRARY(lua-5.2.3 ${lua-5.2.3_SRCS} ${lua-5.2.3_HDRS})

2
src/BulletDynamics/CMakeLists.txt
View File

@ -10,6 +10,7 @@ SET(BulletDynamics_SRCS
ConstraintSolver/btGearConstraint.cpp
ConstraintSolver/btGeneric6DofConstraint.cpp
ConstraintSolver/btGeneric6DofSpringConstraint.cpp
ConstraintSolver/btGeneric6DofSpring2Constraint.cpp
ConstraintSolver/btHinge2Constraint.cpp
ConstraintSolver/btHingeConstraint.cpp
ConstraintSolver/btPoint2PointConstraint.cpp
@ -50,6 +51,7 @@ SET(ConstraintSolver_HDRS
ConstraintSolver/btGearConstraint.h
ConstraintSolver/btGeneric6DofConstraint.h
ConstraintSolver/btGeneric6DofSpringConstraint.h
ConstraintSolver/btGeneric6DofSpring2Constraint.h
ConstraintSolver/btHinge2Constraint.h
ConstraintSolver/btHingeConstraint.h
ConstraintSolver/btJacobianEntry.h