mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-10-05 02:56:31 +00:00
Merge pull request #593 from GrimKriegor/buildsys/server-only-bullet-removal
[Buildsys] Do not require Bullet when building only the server component
This commit is contained in:
commit
c02fb44ea7
1 changed files with 10 additions and 0 deletions
|
@ -329,6 +329,11 @@ if (WIN32)
|
||||||
add_definitions(-DNOMINMAX -DWIN32_LEAN_AND_MEAN)
|
add_definitions(-DNOMINMAX -DWIN32_LEAN_AND_MEAN)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
# Start of tes3mp addition
|
||||||
|
#
|
||||||
|
# Don't require certain dependencies for the server
|
||||||
|
IF(BUILD_OPENMW OR BUILD_OPENCS)
|
||||||
|
# End of tes3mp addition
|
||||||
if(OPENMW_USE_SYSTEM_BULLET)
|
if(OPENMW_USE_SYSTEM_BULLET)
|
||||||
set(REQUIRED_BULLET_VERSION 286) # Bullet 286 required due to runtime bugfixes for btCapsuleShape
|
set(REQUIRED_BULLET_VERSION 286) # Bullet 286 required due to runtime bugfixes for btCapsuleShape
|
||||||
if (DEFINED ENV{TRAVIS_BRANCH} OR DEFINED ENV{APPVEYOR})
|
if (DEFINED ENV{TRAVIS_BRANCH} OR DEFINED ENV{APPVEYOR})
|
||||||
|
@ -361,6 +366,11 @@ if(OPENMW_USE_SYSTEM_BULLET)
|
||||||
message(FATAL_ERROR "Bullet does not uses double precision")
|
message(FATAL_ERROR "Bullet does not uses double precision")
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
# Start of tes3mp addition
|
||||||
|
#
|
||||||
|
# Don't require certain dependencies for the server
|
||||||
|
ENDIF(BUILD_OPENMW OR BUILD_OPENCS)
|
||||||
|
# End of tes3mp addition
|
||||||
|
|
||||||
if (NOT WIN32 AND BUILD_WIZARD) # windows users can just run the morrowind installer
|
if (NOT WIN32 AND BUILD_WIZARD) # windows users can just run the morrowind installer
|
||||||
find_package(LIBUNSHIELD REQUIRED) # required only for non win32 when building openmw-wizard
|
find_package(LIBUNSHIELD REQUIRED) # required only for non win32 when building openmw-wizard
|
||||||
|
|
Loading…
Reference in a new issue