pyrite-dev/assaultfish
13
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

move them around

Browse source
This commit is contained in:
Nishi 2026-01-12 06:41:04 +09:00
commit 53c4ce436a
Signed by: nishi
GPG key ID: 27EF69B208EB9343
5 changed files with 57 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -5,12 +5,14 @@ include(GNUInstallDirs)
set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}") set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
include_directories(external/stb external/lz4) include_directories(external/stb)
set(MW_INSTALL_HEADERS OFF) set(MW_INSTALL_HEADERS OFF)
add_subdirectory(external/milsko)
add_subdirectory(submodule/milsko)
add_subdirectory(external/lz4) add_subdirectory(external/lz4)
add_subdirectory(external/ode)
add_subdirectory(engine) add_subdirectory(engine)

3
engine/CMakeLists.txt
View file

@ -5,8 +5,6 @@ include(GNUInstallDirs)
set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}") set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
add_subdirectory(ode)
macro(install_target name) macro(install_target name)
install( install(
TARGETS ${name} TARGETS ${name}
@ -20,7 +18,6 @@ file(GLOB GearSrc_SRC src/*.c)
add_library(GearSrc SHARED ${GearSrc_SRC}) add_library(GearSrc SHARED ${GearSrc_SRC})
target_include_directories(GearSrc PUBLIC include) target_include_directories(GearSrc PUBLIC include)
target_include_directories(GearSrc PRIVATE lz4)
target_compile_definitions(GearSrc PRIVATE _GEARSRC) target_compile_definitions(GearSrc PRIVATE _GEARSRC)
target_link_libraries(GearSrc PRIVATE ode lz4) target_link_libraries(GearSrc PRIVATE ode lz4)
target_link_options(GearSrc PRIVATE -static-libgcc -static-libstdc++) target_link_options(GearSrc PRIVATE -static-libgcc -static-libstdc++)

53
engine/ode/CMakeLists.txt
View file

@ -1,53 +0,0 @@
cmake_minimum_required(VERSION 3.11)
project(ode)
file(GLOB ODE_SRC
../../external/ode/ode/src/*.c
../../external/ode/ode/src/*.cpp
../../external/ode/ode/src/joints/*.cpp
../../external/ode/ou/src/ou/*.cpp
../../external/ode/GIMPACT/src/*.cpp
../../external/ode/libccd/src/*.c
)
add_library(ode ${ODE_SRC})
target_include_directories(ode PRIVATE
../../external/ode/include
../../external/ode/ode/src
../../external/ode/ode/src/joints
../../external/ode/OPCODE
../../external/ode/ou/include
../../external/ode/GIMPACT/include
../../external/ode/libccd/src/custom
../../external/ode/libccd/src
${CMAKE_CURRENT_BINARY_DIR}
)
list(REMOVE_ITEM ODE_SRC ${CMAKE_CURRENT_SOURCE_DIR}/../../external/ode/ode/src/collision_trimesh_trimesh_old.cpp)
list(REMOVE_ITEM ODE_SRC ${CMAKE_CURRENT_SOURCE_DIR}/../../external/ode/ode/src/collision_trimesh_opcode.cpp)
list(REMOVE_ITEM ODE_SRC ${CMAKE_CURRENT_SOURCE_DIR}/../../external/ode/ode/src/collision_trimesh_disabled.cpp)
target_compile_definitions(ode PRIVATE
_OU_NAMESPACE=odeou
_OU_FEATURE_SET=_OU_FEATURE_SET_TLS
dLIBCCD_ENABLED
dLIBCCD_INTERNAL
dLIBCCD_BOX_CYL
dLIBCCD_CYL_CYL
dLIBCCD_CAP_CYL
dLIBCCD_CONVEX_BOX
dLIBCCD_CONVEX_CAP
dLIBCCD_CONVEX_CYL
dLIBCCD_CONVEX_SPHERE
dLIBCCD_CONVEX_CONVEX
)
set_property(TARGET ode PROPERTY POSITION_INDEPENDENT_CODE ON)
set(ODE_PRECISION "dDOUBLE")
set(CCD_PRECISION "CCD_DOUBLE")
set(ODE_VERSION "Custom-ODE")
configure_file(../../external/ode/include/ode/version.h.in ode/version.h)
configure_file(../../external/ode/include/ode/precision.h.in ode/precision.h)
configure_file(../../external/ode/libccd/src/ccd/precision.h.in ccd/precision.h)
configure_file(config.h.in config.h)

53
external/ode/CMakeLists.txt vendored Normal file
View file

@ -0,0 +1,53 @@
cmake_minimum_required(VERSION 3.11)
project(ode)
file(GLOB ODE_SRC
../../submodule/ode/ode/src/*.c
../../submodule/ode/ode/src/*.cpp
../../submodule/ode/ode/src/joints/*.cpp
../../submodule/ode/ou/src/ou/*.cpp
../../submodule/ode/GIMPACT/src/*.cpp
../../submodule/ode/libccd/src/*.c
)
add_library(ode ${ODE_SRC})
target_include_directories(ode PRIVATE
../../submodule/ode/include
../../submodule/ode/ode/src
../../submodule/ode/ode/src/joints
../../submodule/ode/OPCODE
../../submodule/ode/ou/include
../../submodule/ode/GIMPACT/include
../../submodule/ode/libccd/src/custom
../../submodule/ode/libccd/src
${CMAKE_CURRENT_BINARY_DIR}
)
list(REMOVE_ITEM ODE_SRC ${CMAKE_CURRENT_SOURCE_DIR}/../../submodule/ode/ode/src/collision_trimesh_trimesh_old.cpp)
list(REMOVE_ITEM ODE_SRC ${CMAKE_CURRENT_SOURCE_DIR}/../../submodule/ode/ode/src/collision_trimesh_opcode.cpp)
list(REMOVE_ITEM ODE_SRC ${CMAKE_CURRENT_SOURCE_DIR}/../../submodule/ode/ode/src/collision_trimesh_disabled.cpp)
target_compile_definitions(ode PRIVATE
_OU_NAMESPACE=odeou
_OU_FEATURE_SET=_OU_FEATURE_SET_TLS
dLIBCCD_ENABLED
dLIBCCD_INTERNAL
dLIBCCD_BOX_CYL
dLIBCCD_CYL_CYL
dLIBCCD_CAP_CYL
dLIBCCD_CONVEX_BOX
dLIBCCD_CONVEX_CAP
dLIBCCD_CONVEX_CYL
dLIBCCD_CONVEX_SPHERE
dLIBCCD_CONVEX_CONVEX
)
set_property(TARGET ode PROPERTY POSITION_INDEPENDENT_CODE ON)
set(ODE_PRECISION "dDOUBLE")
set(CCD_PRECISION "CCD_DOUBLE")
set(ODE_VERSION "Custom-ODE")
configure_file(../../submodule/ode/include/ode/version.h.in ode/version.h)
configure_file(../../submodule/ode/include/ode/precision.h.in ode/precision.h)
configure_file(../../submodule/ode/libccd/src/ccd/precision.h.in ccd/precision.h)
configure_file(config.h.in config.h)

0
engine/ode/config.h.in → external/ode/config.h.in vendored
View file