fix whitespace formatting in cmake files
This commit is contained in:
Andrew Meadows
@@ -126,7 +126,7 @@ ENDIF(INTERNAL_CREATE_MSVC_RELATIVE_PATH_PROJECTFILES)
|
||||
ENDIF (WIN32)
|
||||
|
||||
|
||||
OPTION(BUILD_CPU_DEMOS "Build original Bullet CPU examples" ON)
|
||||
OPTION(BUILD_CPU_DEMOS "Build original Bullet CPU examples" ON)
|
||||
|
||||
|
||||
|
||||
@@ -151,8 +151,8 @@ ADD_DEFINITIONS( -D_CRT_SECURE_NO_DEPRECATE )
|
||||
ADD_DEFINITIONS( -D_SCL_SECURE_NO_WARNINGS )
|
||||
|
||||
IF (USE_GLUT AND MSVC)
|
||||
string (REPLACE "/D_WINDOWS" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
|
||||
remove_definitions(-D_WINDOWS )
|
||||
string (REPLACE "/D_WINDOWS" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
|
||||
remove_definitions(-D_WINDOWS )
|
||||
ENDIF()
|
||||
|
||||
|
||||
@@ -194,18 +194,18 @@ OPTION(BUILD_BULLET3 "Set when you want to build Bullet 3" ON)
|
||||
|
||||
IF(BUILD_BULLET3)
|
||||
IF(APPLE)
|
||||
MESSAGE("Mac OSX Version is ${_CURRENT_OSX_VERSION}")
|
||||
IF(_CURRENT_OSX_VERSION VERSION_LESS 10.9)
|
||||
MESSAGE("Mac OSX below 10.9 has no OpenGL 3 support so please disable the BUILD_OPENGL3_DEMOS option")
|
||||
#unset(BUILD_OPENGL3_DEMOS CACHE)
|
||||
MESSAGE("Mac OSX Version is ${_CURRENT_OSX_VERSION}")
|
||||
IF(_CURRENT_OSX_VERSION VERSION_LESS 10.9)
|
||||
MESSAGE("Mac OSX below 10.9 has no OpenGL 3 support so please disable the BUILD_OPENGL3_DEMOS option")
|
||||
#unset(BUILD_OPENGL3_DEMOS CACHE)
|
||||
|
||||
OPTION(BUILD_OPENGL3_DEMOS "Set when you want to build the OpenGL3+ demos" OFF)
|
||||
ELSE()
|
||||
OPTION(BUILD_OPENGL3_DEMOS "Set when you want to build the OpenGL3+ demos" ON)
|
||||
ENDIF()
|
||||
ELSE()
|
||||
OPTION(BUILD_OPENGL3_DEMOS "Set when you want to build Bullet 3 OpenGL3+ demos" ON)
|
||||
ENDIF()
|
||||
OPTION(BUILD_OPENGL3_DEMOS "Set when you want to build the OpenGL3+ demos" OFF)
|
||||
ELSE()
|
||||
OPTION(BUILD_OPENGL3_DEMOS "Set when you want to build the OpenGL3+ demos" ON)
|
||||
ENDIF()
|
||||
ELSE()
|
||||
OPTION(BUILD_OPENGL3_DEMOS "Set when you want to build Bullet 3 OpenGL3+ demos" ON)
|
||||
ENDIF()
|
||||
ELSE(BUILD_BULLET3)
|
||||
unset(BUILD_OPENGL3_DEMOS CACHE)
|
||||
OPTION(BUILD_OPENGL3_DEMOS "Set when you want to build Bullet 3 OpenGL3+ demos" OFF)
|
||||
@@ -221,9 +221,9 @@ ENDIF(BUILD_OPENGL3_DEMOS)
|
||||
OPTION(BUILD_BULLET2_DEMOS "Set when you want to build the Bullet 2 demos" ON)
|
||||
IF(BUILD_BULLET2_DEMOS)
|
||||
|
||||
IF(EXISTS ${BULLET_PHYSICS_SOURCE_DIR}/examples AND IS_DIRECTORY ${BULLET_PHYSICS_SOURCE_DIR}/examples)
|
||||
SUBDIRS(examples)
|
||||
ENDIF()
|
||||
IF(EXISTS ${BULLET_PHYSICS_SOURCE_DIR}/examples AND IS_DIRECTORY ${BULLET_PHYSICS_SOURCE_DIR}/examples)
|
||||
SUBDIRS(examples)
|
||||
ENDIF()
|
||||
ENDIF(BUILD_BULLET2_DEMOS)
|
||||
|
||||
|
||||
@@ -253,15 +253,15 @@ IF(INSTALL_LIBS)
|
||||
SET (LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
|
||||
SET (LIB_DESTINATION "lib${LIB_SUFFIX}" CACHE STRING "Library directory name")
|
||||
## the following are directories where stuff will be installed to
|
||||
SET(INCLUDE_INSTALL_DIR "include/bullet/" CACHE PATH "The subdirectory to the header prefix")
|
||||
SET(INCLUDE_INSTALL_DIR "include/bullet/" CACHE PATH "The subdirectory to the header prefix")
|
||||
SET(PKGCONFIG_INSTALL_PREFIX "lib${LIB_SUFFIX}/pkgconfig/" CACHE STRING "Base directory for pkgconfig files")
|
||||
IF(NOT MSVC)
|
||||
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/bullet.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/bullet.pc @ONLY)
|
||||
INSTALL(
|
||||
FILES
|
||||
${CMAKE_CURRENT_BINARY_DIR}/bullet.pc
|
||||
DESTINATION
|
||||
${PKGCONFIG_INSTALL_PREFIX})
|
||||
FILES
|
||||
${CMAKE_CURRENT_BINARY_DIR}/bullet.pc
|
||||
DESTINATION
|
||||
${PKGCONFIG_INSTALL_PREFIX})
|
||||
ENDIF(NOT MSVC)
|
||||
ENDIF(INSTALL_LIBS)
|
||||
|
||||
@@ -284,11 +284,11 @@ list (APPEND BULLET_LIBRARIES BulletCollision)
|
||||
list (APPEND BULLET_LIBRARIES BulletDynamics)
|
||||
list (APPEND BULLET_LIBRARIES BulletSoftBody)
|
||||
set (BULLET_USE_FILE ${BULLET_CONFIG_CMAKE_PATH}/UseBullet.cmake)
|
||||
configure_file ( ${CMAKE_CURRENT_SOURCE_DIR}/BulletConfig.cmake.in
|
||||
${CMAKE_CURRENT_BINARY_DIR}/BulletConfig.cmake
|
||||
@ONLY ESCAPE_QUOTES
|
||||
)
|
||||
configure_file ( ${CMAKE_CURRENT_SOURCE_DIR}/BulletConfig.cmake.in
|
||||
${CMAKE_CURRENT_BINARY_DIR}/BulletConfig.cmake
|
||||
@ONLY ESCAPE_QUOTES
|
||||
)
|
||||
install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/UseBullet.cmake
|
||||
${CMAKE_CURRENT_BINARY_DIR}/BulletConfig.cmake
|
||||
DESTINATION ${BULLET_CONFIG_CMAKE_PATH}
|
||||
)
|
||||
${CMAKE_CURRENT_BINARY_DIR}/BulletConfig.cmake
|
||||
DESTINATION ${BULLET_CONFIG_CMAKE_PATH}
|
||||
)
|
||||
|
||||
@@ -20,7 +20,7 @@ SET_TARGET_PROPERTIES(BulletInverseDynamicsUtils PROPERTIES VERSION ${BULLET_VER
|
||||
SET_TARGET_PROPERTIES(BulletInverseDynamicsUtils PROPERTIES SOVERSION ${BULLET_VERSION})
|
||||
|
||||
IF (BUILD_SHARED_LIBS)
|
||||
TARGET_LINK_LIBRARIES(BulletInverseDynamicsUtils BulletInverseDynamics BulletDynamics BulletCollision Bullet3Common LinearMath)
|
||||
TARGET_LINK_LIBRARIES(BulletInverseDynamicsUtils BulletInverseDynamics BulletDynamics BulletCollision Bullet3Common LinearMath)
|
||||
ENDIF (BUILD_SHARED_LIBS)
|
||||
|
||||
IF (INSTALL_EXTRA_LIBS)
|
||||
|
||||
@@ -21,29 +21,30 @@ btBulletFile.h
|
||||
ADD_LIBRARY(BulletFileLoader ${BulletFileLoader_SRCS} ${BulletFileLoader_HDRS})
|
||||
|
||||
IF (BUILD_SHARED_LIBS)
|
||||
TARGET_LINK_LIBRARIES(BulletFileLoader LinearMath)
|
||||
TARGET_LINK_LIBRARIES(BulletFileLoader LinearMath)
|
||||
ENDIF (BUILD_SHARED_LIBS)
|
||||
|
||||
SET_TARGET_PROPERTIES(BulletFileLoader PROPERTIES VERSION ${BULLET_VERSION})
|
||||
SET_TARGET_PROPERTIES(BulletFileLoader PROPERTIES SOVERSION ${BULLET_VERSION})
|
||||
|
||||
IF (INSTALL_EXTRA_LIBS)
|
||||
IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
|
||||
#FILES_MATCHING requires CMake 2.6
|
||||
IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
|
||||
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
||||
INSTALL(TARGETS BulletFileLoader DESTINATION .)
|
||||
ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
||||
INSTALL(TARGETS BulletFileLoader DESTINATION lib${LIB_SUFFIX})
|
||||
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
||||
DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN
|
||||
".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE)
|
||||
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
||||
ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
|
||||
IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
|
||||
#FILES_MATCHING requires CMake 2.6
|
||||
IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
|
||||
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
||||
INSTALL(TARGETS BulletFileLoader DESTINATION .)
|
||||
ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
||||
INSTALL(TARGETS BulletFileLoader DESTINATION lib${LIB_SUFFIX})
|
||||
INSTALL(
|
||||
DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
||||
DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN
|
||||
".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE)
|
||||
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
||||
ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
|
||||
|
||||
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
||||
SET_TARGET_PROPERTIES(BulletFileLoader PROPERTIES FRAMEWORK true)
|
||||
SET_TARGET_PROPERTIES(BulletFileLoader PROPERTIES PUBLIC_HEADER "${BulletFileLoader_HDRS}")
|
||||
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
||||
ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
|
||||
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
||||
SET_TARGET_PROPERTIES(BulletFileLoader PROPERTIES FRAMEWORK true)
|
||||
SET_TARGET_PROPERTIES(BulletFileLoader PROPERTIES PUBLIC_HEADER "${BulletFileLoader_HDRS}")
|
||||
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
||||
ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
|
||||
ENDIF (INSTALL_EXTRA_LIBS)
|
||||
|
||||
@@ -15,7 +15,7 @@ SET_TARGET_PROPERTIES(BulletWorldImporter PROPERTIES VERSION ${BULLET_VERSION})
|
||||
SET_TARGET_PROPERTIES(BulletWorldImporter PROPERTIES SOVERSION ${BULLET_VERSION})
|
||||
|
||||
IF (BUILD_SHARED_LIBS)
|
||||
TARGET_LINK_LIBRARIES(BulletWorldImporter BulletDynamics BulletCollision BulletFileLoader LinearMath)
|
||||
TARGET_LINK_LIBRARIES(BulletWorldImporter BulletDynamics BulletCollision BulletFileLoader LinearMath)
|
||||
ENDIF (BUILD_SHARED_LIBS)
|
||||
|
||||
IF (INSTALL_EXTRA_LIBS)
|
||||
|
||||
@@ -22,7 +22,7 @@ SET_TARGET_PROPERTIES(BulletXmlWorldImporter PROPERTIES VERSION ${BULLET_VERSIO
|
||||
SET_TARGET_PROPERTIES(BulletXmlWorldImporter PROPERTIES SOVERSION ${BULLET_VERSION})
|
||||
|
||||
IF (BUILD_SHARED_LIBS)
|
||||
TARGET_LINK_LIBRARIES(BulletXmlWorldImporter BulletWorldImporter BulletDynamics BulletCollision BulletFileLoader LinearMath)
|
||||
TARGET_LINK_LIBRARIES(BulletXmlWorldImporter BulletWorldImporter BulletDynamics BulletCollision BulletFileLoader LinearMath)
|
||||
ENDIF (BUILD_SHARED_LIBS)
|
||||
|
||||
IF (INSTALL_EXTRA_LIBS)
|
||||
|
||||
@@ -68,9 +68,9 @@ SET(App_ExampleBrowser_SRCS
|
||||
../DynamicControlDemo/MotorDemo.cpp
|
||||
../DynamicControlDemo/MotorDemo.h
|
||||
../MultiThreading/MultiThreadingExample.cpp
|
||||
../MultiThreading/b3PosixThreadSupport.cpp
|
||||
../MultiThreading/b3PosixThreadSupport.cpp
|
||||
../MultiThreading/b3Win32ThreadSupport.cpp
|
||||
../MultiThreading/b3ThreadSupportInterface.cpp
|
||||
../MultiThreading/b3ThreadSupportInterface.cpp
|
||||
../RenderingExamples/TimeSeriesCanvas.cpp
|
||||
../RenderingExamples/TimeSeriesCanvas.h
|
||||
../RenderingExamples/TimeSeriesFontData.cpp
|
||||
@@ -156,33 +156,33 @@ SET(App_ExampleBrowser_SRCS
|
||||
../ThirdPartyLibs/stb_image/stb_image.cpp
|
||||
../ThirdPartyLibs/stb_image/stb_image.h
|
||||
|
||||
../ThirdPartyLibs/Wavefront/tiny_obj_loader.cpp
|
||||
../ThirdPartyLibs/tinyxml/tinystr.cpp
|
||||
../ThirdPartyLibs/tinyxml/tinyxml.cpp
|
||||
../ThirdPartyLibs/tinyxml/tinyxmlerror.cpp
|
||||
../ThirdPartyLibs/tinyxml/tinyxmlparser.cpp
|
||||
../ThirdPartyLibs/Wavefront/tiny_obj_loader.cpp
|
||||
../ThirdPartyLibs/tinyxml/tinystr.cpp
|
||||
../ThirdPartyLibs/tinyxml/tinyxml.cpp
|
||||
../ThirdPartyLibs/tinyxml/tinyxmlerror.cpp
|
||||
../ThirdPartyLibs/tinyxml/tinyxmlparser.cpp
|
||||
|
||||
|
||||
../ThirdPartyLibs/urdf/urdfdom/urdf_parser/src/pose.cpp
|
||||
../ThirdPartyLibs/urdf/urdfdom/urdf_parser/src/model.cpp
|
||||
../ThirdPartyLibs/urdf/urdfdom/urdf_parser/src/link.cpp
|
||||
../ThirdPartyLibs/urdf/urdfdom/urdf_parser/src/joint.cpp
|
||||
../ThirdPartyLibs/urdf/urdfdom/urdf_parser/include/urdf_parser/urdf_parser.h
|
||||
../ThirdPartyLibs/urdf/urdfdom_headers/urdf_exception/include/urdf_exception/exception.h
|
||||
../ThirdPartyLibs/urdf/urdfdom_headers/urdf_model/include/urdf_model/pose.h
|
||||
../ThirdPartyLibs/urdf/urdfdom_headers/urdf_model/include/urdf_model/model.h
|
||||
../ThirdPartyLibs/urdf/urdfdom_headers/urdf_model/include/urdf_model/link.h
|
||||
../ThirdPartyLibs/urdf/urdfdom_headers/urdf_model/include/urdf_model/joint.h
|
||||
../ThirdPartyLibs/tinyxml/tinystr.cpp
|
||||
../ThirdPartyLibs/tinyxml/tinyxml.cpp
|
||||
../ThirdPartyLibs/tinyxml/tinyxmlerror.cpp
|
||||
../ThirdPartyLibs/tinyxml/tinyxmlparser.cpp
|
||||
../ThirdPartyLibs/urdf/boost_replacement/lexical_cast.h
|
||||
../ThirdPartyLibs/urdf/boost_replacement/shared_ptr.h
|
||||
../ThirdPartyLibs/urdf/boost_replacement/printf_console.cpp
|
||||
../ThirdPartyLibs/urdf/boost_replacement/printf_console.h
|
||||
../ThirdPartyLibs/urdf/boost_replacement/string_split.cpp
|
||||
../ThirdPartyLibs/urdf/boost_replacement/string_split.h
|
||||
../ThirdPartyLibs/urdf/urdfdom/urdf_parser/src/link.cpp
|
||||
../ThirdPartyLibs/urdf/urdfdom/urdf_parser/src/joint.cpp
|
||||
../ThirdPartyLibs/urdf/urdfdom/urdf_parser/include/urdf_parser/urdf_parser.h
|
||||
../ThirdPartyLibs/urdf/urdfdom_headers/urdf_exception/include/urdf_exception/exception.h
|
||||
../ThirdPartyLibs/urdf/urdfdom_headers/urdf_model/include/urdf_model/pose.h
|
||||
../ThirdPartyLibs/urdf/urdfdom_headers/urdf_model/include/urdf_model/model.h
|
||||
../ThirdPartyLibs/urdf/urdfdom_headers/urdf_model/include/urdf_model/link.h
|
||||
../ThirdPartyLibs/urdf/urdfdom_headers/urdf_model/include/urdf_model/joint.h
|
||||
../ThirdPartyLibs/tinyxml/tinystr.cpp
|
||||
../ThirdPartyLibs/tinyxml/tinyxml.cpp
|
||||
../ThirdPartyLibs/tinyxml/tinyxmlerror.cpp
|
||||
../ThirdPartyLibs/tinyxml/tinyxmlparser.cpp
|
||||
../ThirdPartyLibs/urdf/boost_replacement/lexical_cast.h
|
||||
../ThirdPartyLibs/urdf/boost_replacement/shared_ptr.h
|
||||
../ThirdPartyLibs/urdf/boost_replacement/printf_console.cpp
|
||||
../ThirdPartyLibs/urdf/boost_replacement/printf_console.h
|
||||
../ThirdPartyLibs/urdf/boost_replacement/string_split.cpp
|
||||
../ThirdPartyLibs/urdf/boost_replacement/string_split.h
|
||||
../Utils/b3Clock.cpp
|
||||
../Utils/b3Clock.h
|
||||
../Utils/b3ResourcePath.cpp
|
||||
@@ -193,7 +193,7 @@ SET(App_ExampleBrowser_SRCS
|
||||
)
|
||||
|
||||
LINK_LIBRARIES(
|
||||
Bullet3Common BulletSoftBody BulletDynamics BulletCollision BulletInverseDynamicsUtils BulletInverseDynamics LinearMath OpenGLWindow gwen ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
|
||||
Bullet3Common BulletSoftBody BulletDynamics BulletCollision BulletInverseDynamicsUtils BulletInverseDynamics LinearMath OpenGLWindow gwen ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
|
||||
)
|
||||
|
||||
IF (WIN32)
|
||||
@@ -204,16 +204,14 @@ IF (WIN32)
|
||||
ADD_DEFINITIONS(-DGLEW_STATIC)
|
||||
ELSE(WIN32)
|
||||
IF(APPLE)
|
||||
find_library(COCOA NAMES Cocoa)
|
||||
MESSAGE(${COCOA})
|
||||
link_libraries(${COCOA})
|
||||
find_library(COCOA NAMES Cocoa)
|
||||
MESSAGE(${COCOA})
|
||||
link_libraries(${COCOA})
|
||||
ELSE(APPLE)
|
||||
ADD_DEFINITIONS("-DGLEW_INIT_OPENGL11_FUNCTIONS=1")
|
||||
ADD_DEFINITIONS("-DGLEW_STATIC")
|
||||
ADD_DEFINITIONS("-DGLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS=1")
|
||||
INCLUDE_DIRECTORIES(
|
||||
${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/Glew
|
||||
)
|
||||
ADD_DEFINITIONS("-DGLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS=1")
|
||||
INCLUDE_DIRECTORIES( ${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/Glew )
|
||||
LINK_LIBRARIES( pthread dl)
|
||||
ENDIF(APPLE)
|
||||
ENDIF(WIN32)
|
||||
|
||||
@@ -34,10 +34,10 @@ ENDIF(APPLE)
|
||||
IF(NOT WIN32 AND NOT APPLE)
|
||||
INCLUDE_DIRECTORIES(
|
||||
${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/Glew
|
||||
)
|
||||
ADD_DEFINITIONS(-DGLEW_STATIC)
|
||||
)
|
||||
ADD_DEFINITIONS(-DGLEW_STATIC)
|
||||
ADD_DEFINITIONS("-DGLEW_INIT_OPENGL11_FUNCTIONS=1")
|
||||
ADD_DEFINITIONS("-DGLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS=1")
|
||||
ADD_DEFINITIONS("-DGLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS=1")
|
||||
|
||||
SET(OpenGLWindow_SRCS ${OpenGLWindowLinux_CPP} ${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/Glew/glew.c ${OpenGLWindowCommon_CPP} )
|
||||
ENDIF()
|
||||
@@ -57,7 +57,7 @@ if (BUILD_SHARED_LIBS)
|
||||
target_link_libraries(OpenGLWindow ${OPENGL_gl_LIBRARY})
|
||||
else()
|
||||
set (CMAKE_THREAD_PREFER_PTHREAD TRUE)
|
||||
FIND_PACKAGE(Threads)
|
||||
FIND_PACKAGE(Threads)
|
||||
target_link_libraries(OpenGLWindow ${CMAKE_THREAD_LIBS_INIT})
|
||||
endif()
|
||||
endif()
|
||||
|
||||
@@ -14,7 +14,7 @@ SET(AppSimpleOpenGL3_SRCS
|
||||
)
|
||||
|
||||
LINK_LIBRARIES(
|
||||
gwen OpenGLWindow Bullet3Common ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
|
||||
gwen OpenGLWindow Bullet3Common ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
|
||||
)
|
||||
|
||||
IF (WIN32)
|
||||
@@ -28,14 +28,14 @@ ELSE(WIN32)
|
||||
find_library(COCOA NAMES Cocoa)
|
||||
MESSAGE(${COCOA})
|
||||
link_libraries(${COCOA})
|
||||
ELSE(APPLE)
|
||||
|
||||
INCLUDE_DIRECTORIES(
|
||||
${BULLET_PHYSICS_SOURCE_DIR}/btgui/OpenGLWindow/GlewWindows
|
||||
)
|
||||
ADD_DEFINITIONS("-DGLEW_INIT_OPENGL11_FUNCTIONS=1")
|
||||
ADD_DEFINITIONS("-DGLEW_STATIC")
|
||||
ADD_DEFINITIONS("-DGLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS=1")
|
||||
ELSE(APPLE)
|
||||
INCLUDE_DIRECTORIES(
|
||||
${BULLET_PHYSICS_SOURCE_DIR}/btgui/OpenGLWindow/GlewWindows
|
||||
)
|
||||
ADD_DEFINITIONS("-DGLEW_INIT_OPENGL11_FUNCTIONS=1")
|
||||
ADD_DEFINITIONS("-DGLEW_STATIC")
|
||||
ADD_DEFINITIONS("-DGLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS=1")
|
||||
|
||||
LINK_LIBRARIES( X11 pthread dl Xext)
|
||||
ENDIF(APPLE)
|
||||
|
||||
@@ -4,11 +4,11 @@ INCLUDE_DIRECTORIES(
|
||||
)
|
||||
|
||||
SET(Bullet3Collision_SRCS
|
||||
BroadPhaseCollision/b3DynamicBvh.cpp
|
||||
BroadPhaseCollision/b3DynamicBvhBroadphase.cpp
|
||||
BroadPhaseCollision/b3OverlappingPairCache.cpp
|
||||
NarrowPhaseCollision/b3ConvexUtility.cpp
|
||||
NarrowPhaseCollision/b3CpuNarrowPhase.cpp
|
||||
BroadPhaseCollision/b3DynamicBvh.cpp
|
||||
BroadPhaseCollision/b3DynamicBvhBroadphase.cpp
|
||||
BroadPhaseCollision/b3OverlappingPairCache.cpp
|
||||
NarrowPhaseCollision/b3ConvexUtility.cpp
|
||||
NarrowPhaseCollision/b3CpuNarrowPhase.cpp
|
||||
)
|
||||
|
||||
SET(Bullet3CollisionBroadPhase_HDRS
|
||||
|
||||
@@ -14,19 +14,19 @@ SET(Bullet3Dynamics_SRCS
|
||||
|
||||
SET(Bullet3Dynamics_HDRS
|
||||
b3CpuRigidBodyPipeline.h
|
||||
ConstraintSolver/b3ContactSolverInfo.h
|
||||
ConstraintSolver/b3FixedConstraint.h
|
||||
ConstraintSolver/b3Generic6DofConstraint.h
|
||||
ConstraintSolver/b3JacobianEntry.h
|
||||
ConstraintSolver/b3PgsJacobiSolver.h
|
||||
ConstraintSolver/b3Point2PointConstraint.h
|
||||
ConstraintSolver/b3SolverBody.h
|
||||
ConstraintSolver/b3SolverConstraint.h
|
||||
ConstraintSolver/b3TypedConstraint.h
|
||||
shared/b3ContactConstraint4.h
|
||||
shared/b3ConvertConstraint4.h
|
||||
shared/b3Inertia.h
|
||||
shared/b3IntegrateTransforms.h
|
||||
ConstraintSolver/b3ContactSolverInfo.h
|
||||
ConstraintSolver/b3FixedConstraint.h
|
||||
ConstraintSolver/b3Generic6DofConstraint.h
|
||||
ConstraintSolver/b3JacobianEntry.h
|
||||
ConstraintSolver/b3PgsJacobiSolver.h
|
||||
ConstraintSolver/b3Point2PointConstraint.h
|
||||
ConstraintSolver/b3SolverBody.h
|
||||
ConstraintSolver/b3SolverConstraint.h
|
||||
ConstraintSolver/b3TypedConstraint.h
|
||||
shared/b3ContactConstraint4.h
|
||||
shared/b3ConvertConstraint4.h
|
||||
shared/b3Inertia.h
|
||||
shared/b3IntegrateTransforms.h
|
||||
)
|
||||
|
||||
ADD_LIBRARY(Bullet3Dynamics ${Bullet3Dynamics_SRCS} ${Bullet3Dynamics_HDRS})
|
||||
|
||||
@@ -3,36 +3,36 @@ INCLUDE_DIRECTORIES( ${BULLET_PHYSICS_SOURCE_DIR}/src )
|
||||
ADD_DEFINITIONS(-DB3_USE_CLEW)
|
||||
|
||||
SET(Bullet3OpenCL_clew_SRCS
|
||||
../clew/clew.c
|
||||
BroadphaseCollision/b3GpuGridBroadphase.cpp
|
||||
BroadphaseCollision/b3GpuSapBroadphase.cpp
|
||||
../clew/clew.c
|
||||
BroadphaseCollision/b3GpuGridBroadphase.cpp
|
||||
BroadphaseCollision/b3GpuSapBroadphase.cpp
|
||||
BroadphaseCollision/b3GpuParallelLinearBvhBroadphase.cpp
|
||||
BroadphaseCollision/b3GpuParallelLinearBvh.cpp
|
||||
Initialize/b3OpenCLUtils.cpp
|
||||
NarrowphaseCollision/b3ContactCache.cpp
|
||||
NarrowphaseCollision/b3ConvexHullContact.cpp
|
||||
NarrowphaseCollision/b3GjkEpa.cpp
|
||||
NarrowphaseCollision/b3GjkPairDetector.cpp
|
||||
NarrowphaseCollision/b3OptimizedBvh.cpp
|
||||
NarrowphaseCollision/b3QuantizedBvh.cpp
|
||||
NarrowphaseCollision/b3StridingMeshInterface.cpp
|
||||
NarrowphaseCollision/b3TriangleCallback.cpp
|
||||
NarrowphaseCollision/b3TriangleIndexVertexArray.cpp
|
||||
NarrowphaseCollision/b3VoronoiSimplexSolver.cpp
|
||||
ParallelPrimitives/b3BoundSearchCL.cpp
|
||||
ParallelPrimitives/b3FillCL.cpp
|
||||
ParallelPrimitives/b3LauncherCL.cpp
|
||||
ParallelPrimitives/b3PrefixScanCL.cpp
|
||||
ParallelPrimitives/b3PrefixScanFloat4CL.cpp
|
||||
ParallelPrimitives/b3RadixSort32CL.cpp
|
||||
Raycast/b3GpuRaycast.cpp
|
||||
RigidBody/b3GpuGenericConstraint.cpp
|
||||
RigidBody/b3GpuJacobiContactSolver.cpp
|
||||
RigidBody/b3GpuNarrowPhase.cpp
|
||||
RigidBody/b3GpuPgsConstraintSolver.cpp
|
||||
RigidBody/b3GpuPgsContactSolver.cpp
|
||||
RigidBody/b3GpuRigidBodyPipeline.cpp
|
||||
RigidBody/b3Solver.cpp
|
||||
Initialize/b3OpenCLUtils.cpp
|
||||
NarrowphaseCollision/b3ContactCache.cpp
|
||||
NarrowphaseCollision/b3ConvexHullContact.cpp
|
||||
NarrowphaseCollision/b3GjkEpa.cpp
|
||||
NarrowphaseCollision/b3GjkPairDetector.cpp
|
||||
NarrowphaseCollision/b3OptimizedBvh.cpp
|
||||
NarrowphaseCollision/b3QuantizedBvh.cpp
|
||||
NarrowphaseCollision/b3StridingMeshInterface.cpp
|
||||
NarrowphaseCollision/b3TriangleCallback.cpp
|
||||
NarrowphaseCollision/b3TriangleIndexVertexArray.cpp
|
||||
NarrowphaseCollision/b3VoronoiSimplexSolver.cpp
|
||||
ParallelPrimitives/b3BoundSearchCL.cpp
|
||||
ParallelPrimitives/b3FillCL.cpp
|
||||
ParallelPrimitives/b3LauncherCL.cpp
|
||||
ParallelPrimitives/b3PrefixScanCL.cpp
|
||||
ParallelPrimitives/b3PrefixScanFloat4CL.cpp
|
||||
ParallelPrimitives/b3RadixSort32CL.cpp
|
||||
Raycast/b3GpuRaycast.cpp
|
||||
RigidBody/b3GpuGenericConstraint.cpp
|
||||
RigidBody/b3GpuJacobiContactSolver.cpp
|
||||
RigidBody/b3GpuNarrowPhase.cpp
|
||||
RigidBody/b3GpuPgsConstraintSolver.cpp
|
||||
RigidBody/b3GpuPgsContactSolver.cpp
|
||||
RigidBody/b3GpuRigidBodyPipeline.cpp
|
||||
RigidBody/b3Solver.cpp
|
||||
)
|
||||
|
||||
|
||||
|
||||
@@ -4,23 +4,23 @@ INCLUDE_DIRECTORIES(
|
||||
)
|
||||
|
||||
SET(Bullet2FileLoader_SRCS
|
||||
b3BulletFile.cpp
|
||||
b3Chunk.cpp
|
||||
b3DNA.cpp
|
||||
b3File.cpp
|
||||
b3Serializer.cpp
|
||||
b3BulletFile.cpp
|
||||
b3Chunk.cpp
|
||||
b3DNA.cpp
|
||||
b3File.cpp
|
||||
b3Serializer.cpp
|
||||
)
|
||||
|
||||
|
||||
SET(Bullet2FileLoader_HDRS
|
||||
b3BulletFile.h
|
||||
b3Chunk.h
|
||||
b3Common.h
|
||||
b3Defines.h
|
||||
b3DNA.h
|
||||
b3File.h
|
||||
b3Serializer.h
|
||||
autogenerated/bullet2.h
|
||||
b3Chunk.h
|
||||
b3Common.h
|
||||
b3Defines.h
|
||||
b3DNA.h
|
||||
b3File.h
|
||||
b3Serializer.h
|
||||
autogenerated/bullet2.h
|
||||
)
|
||||
|
||||
ADD_LIBRARY(Bullet2FileLoader ${Bullet2FileLoader_SRCS} ${Bullet2FileLoader_HDRS})
|
||||
|
||||
Reference in New Issue
Block a user