forked from teamnwah/openmw-tes3coop
first attempt at building with bullet
This commit is contained in:
parent
a724de2429
commit
8b2252e7a1
3 changed files with 90 additions and 10 deletions
|
@ -226,6 +226,7 @@ find_package(OGRE REQUIRED)
|
||||||
find_package(Boost REQUIRED COMPONENTS system filesystem program_options thread)
|
find_package(Boost REQUIRED COMPONENTS system filesystem program_options thread)
|
||||||
find_package(OIS REQUIRED)
|
find_package(OIS REQUIRED)
|
||||||
find_package(OpenAL REQUIRED)
|
find_package(OpenAL REQUIRED)
|
||||||
|
find_package(Bullet REQUIRED)
|
||||||
include_directories("."
|
include_directories("."
|
||||||
${OGRE_INCLUDE_DIR} ${OGRE_INCLUDE_DIR}/Ogre ${OGRE_INCLUDE_DIR}/OGRE
|
${OGRE_INCLUDE_DIR} ${OGRE_INCLUDE_DIR}/Ogre ${OGRE_INCLUDE_DIR}/OGRE
|
||||||
${OIS_INCLUDE_DIR} ${Boost_INCLUDE_DIR}
|
${OIS_INCLUDE_DIR} ${Boost_INCLUDE_DIR}
|
||||||
|
|
|
@ -225,15 +225,18 @@ add_executable(openmw
|
||||||
|
|
||||||
# Sound stuff - here so CMake doesn't stupidly recompile EVERYTHING
|
# Sound stuff - here so CMake doesn't stupidly recompile EVERYTHING
|
||||||
# when we change the backend.
|
# when we change the backend.
|
||||||
include_directories(${SOUND_INPUT_INCLUDES})
|
include_directories(${SOUND_INPUT_INCLUDES} ${BULLET_INCLUDE_DIRS})
|
||||||
add_definitions(${SOUND_DEFINE})
|
add_definitions(${SOUND_DEFINE})
|
||||||
|
|
||||||
|
message (INFO ${BULLET_INCLUDE_DIR})
|
||||||
|
|
||||||
target_link_libraries(openmw
|
target_link_libraries(openmw
|
||||||
${OGRE_LIBRARIES}
|
${OGRE_LIBRARIES}
|
||||||
${OIS_LIBRARIES}
|
${OIS_LIBRARIES}
|
||||||
${Boost_LIBRARIES}
|
${Boost_LIBRARIES}
|
||||||
${OPENAL_LIBRARY}
|
${OPENAL_LIBRARY}
|
||||||
${SOUND_INPUT_LIBRARY}
|
${SOUND_INPUT_LIBRARY}
|
||||||
|
${BULLET_LIBRARIES}
|
||||||
caelum
|
caelum
|
||||||
MyGUIEngine
|
MyGUIEngine
|
||||||
MyGUIOgrePlatform
|
MyGUIOgrePlatform
|
||||||
|
|
76
cmake/FindBullet.cmake
Normal file
76
cmake/FindBullet.cmake
Normal file
|
@ -0,0 +1,76 @@
|
||||||
|
# - Try to find the Bullet physics engine
|
||||||
|
#
|
||||||
|
# This module defines the following variables
|
||||||
|
#
|
||||||
|
# BULLET_FOUND - Was bullet found
|
||||||
|
# BULLET_INCLUDE_DIRS - the Bullet include directories
|
||||||
|
# BULLET_LIBRARIES - Link to this, by default it includes
|
||||||
|
# all bullet components (Dynamics,
|
||||||
|
# Collision, LinearMath, & SoftBody)
|
||||||
|
#
|
||||||
|
# This module accepts the following variables
|
||||||
|
#
|
||||||
|
# BULLET_ROOT - Can be set to bullet install path or Windows build path
|
||||||
|
#
|
||||||
|
|
||||||
|
# Copyright (c) 2009, Philip Lowman <philip at yhbt.com>
|
||||||
|
#
|
||||||
|
# Redistribution AND use is allowed according to the terms of the New
|
||||||
|
# BSD license.
|
||||||
|
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
|
||||||
|
|
||||||
|
macro(_FIND_BULLET_LIBRARY _var)
|
||||||
|
find_library(${_var}
|
||||||
|
NAMES
|
||||||
|
${ARGN}
|
||||||
|
PATHS
|
||||||
|
${BULLET_ROOT}
|
||||||
|
${BULLET_ROOT}/out/release8/libs
|
||||||
|
${BULLET_ROOT}/out/debug8/libs
|
||||||
|
PATH_SUFFIXES lib
|
||||||
|
)
|
||||||
|
mark_as_advanced(${_var})
|
||||||
|
endmacro()
|
||||||
|
|
||||||
|
macro(_BULLET_APPEND_LIBRARIES _list _release)
|
||||||
|
set(_debug ${_release}_DEBUG)
|
||||||
|
if(${_debug})
|
||||||
|
set(${_list} ${${_list}} optimized ${${_release}} debug ${${_debug}})
|
||||||
|
else()
|
||||||
|
set(${_list} ${${_list}} ${${_release}})
|
||||||
|
endif()
|
||||||
|
endmacro()
|
||||||
|
|
||||||
|
find_path(BULLET_INCLUDE_DIR NAMES btBulletCollisionCommon.h
|
||||||
|
PATHS
|
||||||
|
${BULLET_ROOT}/include
|
||||||
|
${BULLET_ROOT}/src
|
||||||
|
PATH_SUFFIXES bullet
|
||||||
|
)
|
||||||
|
|
||||||
|
# Find the libraries
|
||||||
|
|
||||||
|
_FIND_BULLET_LIBRARY(BULLET_DYNAMICS_LIBRARY BulletDynamics)
|
||||||
|
_FIND_BULLET_LIBRARY(BULLET_DYNAMICS_LIBRARY_DEBUG BulletDynamics_d)
|
||||||
|
_FIND_BULLET_LIBRARY(BULLET_COLLISION_LIBRARY BulletCollision)
|
||||||
|
_FIND_BULLET_LIBRARY(BULLET_COLLISION_LIBRARY_DEBUG BulletCollision_d)
|
||||||
|
_FIND_BULLET_LIBRARY(BULLET_MATH_LIBRARY LinearMath BulletMath)
|
||||||
|
_FIND_BULLET_LIBRARY(BULLET_MATH_LIBRARY_DEBUG LinearMath_d BulletMath_d)
|
||||||
|
_FIND_BULLET_LIBRARY(BULLET_SOFTBODY_LIBRARY BulletSoftBody)
|
||||||
|
_FIND_BULLET_LIBRARY(BULLET_SOFTBODY_LIBRARY_DEBUG BulletSoftBody_d)
|
||||||
|
|
||||||
|
|
||||||
|
# handle the QUIETLY and REQUIRED arguments and set BULLET_FOUND to TRUE if
|
||||||
|
# all listed variables are TRUE
|
||||||
|
include(FindPackageHandleStandardArgs)
|
||||||
|
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Bullet DEFAULT_MSG
|
||||||
|
BULLET_DYNAMICS_LIBRARY BULLET_COLLISION_LIBRARY BULLET_MATH_LIBRARY
|
||||||
|
BULLET_SOFTBODY_LIBRARY BULLET_INCLUDE_DIR)
|
||||||
|
|
||||||
|
set(BULLET_INCLUDE_DIRS ${BULLET_INCLUDE_DIR})
|
||||||
|
if(BULLET_FOUND)
|
||||||
|
_BULLET_APPEND_LIBRARIES(BULLET_LIBRARIES BULLET_DYNAMICS_LIBRARY)
|
||||||
|
_BULLET_APPEND_LIBRARIES(BULLET_LIBRARIES BULLET_COLLISION_LIBRARY)
|
||||||
|
_BULLET_APPEND_LIBRARIES(BULLET_LIBRARIES BULLET_MATH_LIBRARY)
|
||||||
|
_BULLET_APPEND_LIBRARIES(BULLET_LIBRARIES BULLET_SOFTBODY_LIBRARY)
|
||||||
|
endif()
|
Loading…
Reference in a new issue