Репозитории ALT
S: | 0.6.2-alt1 |
5.1: | 0.5.2-alt1 |
4.1: | 0.5.1-alt0.M41.1 |
4.0: | 0.3.3-alt1 |
3.0: | 0.1.3-alt1 |
Группа :: Игры/Аркады
Пакет: xmoto
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: xmoto-0.6.2-alt-system-ode.patch
Скачать
Скачать
diff --git a/SOURCES/xmoto/src/CMakeLists.txt b/SOURCES/xmoto/src/CMakeLists.txt
index fc48046..242e71f 100644
--- a/SOURCES/xmoto/src/CMakeLists.txt
+++ b/SOURCES/xmoto/src/CMakeLists.txt
@@ -5,6 +5,7 @@ option(USE_GETTEXT "Build with Gettext for internationalization" ON)
option(PREFER_SYSTEM_BZip2 "Prefer system BZip2" ON)
option(PREFER_SYSTEM_Lua "Prefer system Lua" ON)
option(PREFER_SYSTEM_XDG "Prefer system XDG" ON)
+option(PREFER_SYSTEM_ODE "Prefer system ODE" ON)
option(ALLOW_DEV "Enable some development/debug features" OFF)
option(BUILD_MACOS_BUNDLE "Build xmoto as a macOS Bundle" OFF)
@@ -73,6 +74,9 @@ set(USE_SYSTEM_XDG $<AND:$<BOOL:${PREFER_SYSTEM_XDG}>,$<BOOL:${XDG_FOUND}>>)
find_package(ZLIB REQUIRED)
+find_package(ODE)
+set(USE_SYSTEM_ODE $<AND:$<BOOL:${PREFER_SYSTEM_ODE}>,$<BOOL:${ODE_FOUND}>>)
+
if(APPLE)
find_library(COREFOUNDATION_LIBRARY CoreFoundation)
endif()
@@ -85,13 +89,9 @@ check_prototype_definition(mkdir
MS_MKDIR
)
-add_subdirectory("${PROJECT_SOURCE_DIR}/vendor/bzip2" bzip2)
add_subdirectory("${PROJECT_SOURCE_DIR}/vendor/libccd" libccd)
add_subdirectory("${PROJECT_SOURCE_DIR}/vendor/chipmunk" chipmunk)
-add_subdirectory("${PROJECT_SOURCE_DIR}/vendor/lua" lua)
add_subdirectory("${PROJECT_SOURCE_DIR}/vendor/md5sum" md5sum)
-add_subdirectory("${PROJECT_SOURCE_DIR}/vendor/ode" ode)
-add_subdirectory("${PROJECT_SOURCE_DIR}/vendor/xdgbasedir" xdgbasedir)
add_subdirectory("${PROJECT_SOURCE_DIR}/vendor/glad" glad)
configure_file(common/XMBuildConfig.h.in common/XMBuildConfig.h)
@@ -487,7 +487,8 @@ target_link_libraries(xmoto PUBLIC
"$<${USE_SYSTEM_Lua}:${LUA_LIBRARIES}>"
$<$<NOT:${USE_SYSTEM_Lua}>:lua>
md5sum
- ode
+ "$<${USE_SYSTEM_ODE}:${ODE_LIBRARY}>"
+ $<$<NOT:${USE_SYSTEM_ODE}>:ode>
glad
${CMAKE_DL_LIBS}
${OPENGL_LIBRARIES}
@@ -685,6 +686,7 @@ message("Jpeg libraries: ${JPEG_LIBRARIES}")
message("LibXml2 libraries: ${LIBXML2_LIBRARIES}")
message("LibLZMA libraries: ${LIBLZMA_LIBRARIES}")
message("Lua librarues: ${LUA_LIBRARIES}")
+message("ODE libraries: ${ODE_LIBRARY}")
message("OpenGL libraries: ${OPENGL_LIBRARIES}")
message("Png libraries: ${PNG_LIBRARY}")
message("SDL2 libraries: ${SDL2_LIBRARIES}")