mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2024-11-21 12:01:05 +00:00
replace CPM with vcpkg
This commit is contained in:
Logan Aerl Arias
parent
dfecbe87b8
commit
6b4dac7478
47 changed files with 2859 additions and 418 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -26,3 +26,4 @@ Win32_LIB_ASM_Release
|
||||||
/CMakeUserPresets.json
|
/CMakeUserPresets.json
|
||||||
/out
|
/out
|
||||||
/objs/VC10
|
/objs/VC10
|
||||||
|
/thirdparty/vcpkg-overlays
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,6 @@ endif()
|
||||||
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
|
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
|
||||||
|
|
||||||
include(CMakeDependentOption)
|
include(CMakeDependentOption)
|
||||||
include(cmake/CPM.cmake)
|
|
||||||
|
|
||||||
file(STRINGS src/version.h SRB2_VERSION)
|
file(STRINGS src/version.h SRB2_VERSION)
|
||||||
string(REGEX MATCH "[0-9]+\\.[0-9.]+" SRB2_VERSION ${SRB2_VERSION})
|
string(REGEX MATCH "[0-9]+\\.[0-9.]+" SRB2_VERSION ${SRB2_VERSION})
|
||||||
|
|
@ -46,28 +45,23 @@ SET(CPACK_OUTPUT_FILE_PREFIX package)
|
||||||
include(CPack)
|
include(CPack)
|
||||||
|
|
||||||
# Options
|
# Options
|
||||||
|
if("${CMAKE_SYSTEM_NAME}" MATCHES Windows)
|
||||||
if("${CMAKE_SYSTEM_NAME}" MATCHES Linux)
|
if(DEFINED VCPKG_TARGET_TRIPLET)
|
||||||
set(SRB2_CONFIG_SYSTEM_LIBRARIES_DEFAULT ON)
|
set(SRB2_CONFIG_SYSTEM_LIBRARIES_DEFAULT ON)
|
||||||
|
else()
|
||||||
|
set(SRB2_CONFIG_SYSTEM_LIBRARIES_DEFAULT OFF)
|
||||||
|
endif()
|
||||||
else()
|
else()
|
||||||
set(SRB2_CONFIG_SYSTEM_LIBRARIES_DEFAULT OFF)
|
set(SRB2_CONFIG_SYSTEM_LIBRARIES_DEFAULT ON)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Clang tidy options will be ignored if CMAKE_<LANG>_CLANG_TIDY are set.
|
# Clang tidy options will be ignored if CMAKE_<LANG>_CLANG_TIDY are set.
|
||||||
option(SRB2_CONFIG_ENABLE_CLANG_TIDY_C "Enable default clang-tidy check configuration for C" OFF)
|
option(SRB2_CONFIG_ENABLE_CLANG_TIDY_C "Enable default clang-tidy check configuration for C" OFF)
|
||||||
option(SRB2_CONFIG_ENABLE_CLANG_TIDY_CXX "Enable default clang-tidy check configuration for C++" OFF)
|
option(SRB2_CONFIG_ENABLE_CLANG_TIDY_CXX "Enable default clang-tidy check configuration for C++" OFF)
|
||||||
option(
|
option(
|
||||||
SRB2_CONFIG_SYSTEM_LIBRARIES
|
SRB2_CONFIG_STATIC_STDLIB
|
||||||
"Link dependencies using CMake's find_package and do not use internal builds"
|
"Link static version of standard library. All dependencies must also be static"
|
||||||
${SRB2_CONFIG_SYSTEM_LIBRARIES_DEFAULT}
|
ON
|
||||||
)
|
|
||||||
option(SRB2_CONFIG_ENABLE_TESTS "Build the test suite" ON)
|
|
||||||
# This option isn't recommended for distribution builds and probably won't work (yet).
|
|
||||||
cmake_dependent_option(
|
|
||||||
SRB2_CONFIG_SHARED_INTERNAL_LIBRARIES
|
|
||||||
"Use dynamic libraries when compiling internal dependencies"
|
|
||||||
OFF "NOT SRB2_CONFIG_SYSTEM_LIBRARIES"
|
|
||||||
OFF
|
|
||||||
)
|
)
|
||||||
option(SRB2_CONFIG_HWRENDER "Enable hardware render (OpenGL) support" ON)
|
option(SRB2_CONFIG_HWRENDER "Enable hardware render (OpenGL) support" ON)
|
||||||
option(SRB2_CONFIG_USE_GME "Enable GME playback support" OFF)
|
option(SRB2_CONFIG_USE_GME "Enable GME playback support" OFF)
|
||||||
|
|
@ -82,64 +76,28 @@ option(SRB2_CONFIG_ZDEBUG "Compile with ZDEBUG defined." OFF)
|
||||||
option(SRB2_CONFIG_PROFILEMODE "Compile for profiling (GCC only)." OFF)
|
option(SRB2_CONFIG_PROFILEMODE "Compile for profiling (GCC only)." OFF)
|
||||||
set(SRB2_CONFIG_ASSET_DIRECTORY "" CACHE PATH "Path to directory that contains all asset files for the installer. If set, assets will be part of installation and cpack.")
|
set(SRB2_CONFIG_ASSET_DIRECTORY "" CACHE PATH "Path to directory that contains all asset files for the installer. If set, assets will be part of installation and cpack.")
|
||||||
|
|
||||||
if(SRB2_CONFIG_ENABLE_TESTS)
|
|
||||||
# https://github.com/catchorg/Catch2
|
|
||||||
CPMAddPackage(
|
|
||||||
NAME Catch2
|
|
||||||
VERSION 3.4.0
|
|
||||||
GITHUB_REPOSITORY catchorg/Catch2
|
|
||||||
OPTIONS
|
|
||||||
"CATCH_INSTALL_DOCS OFF"
|
|
||||||
)
|
|
||||||
list(APPEND CMAKE_MODULE_PATH "${Catch2_SOURCE_DIR}/extras")
|
|
||||||
include(CTest)
|
|
||||||
include(Catch)
|
|
||||||
add_executable(srb2tests)
|
|
||||||
# To add tests, use target_sources to add individual test files to the target in subdirs.
|
|
||||||
target_link_libraries(srb2tests PRIVATE Catch2::Catch2 Catch2::Catch2WithMain)
|
|
||||||
target_compile_features(srb2tests PRIVATE c_std_11 cxx_std_17)
|
|
||||||
catch_discover_tests(srb2tests)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# Enable CCache
|
|
||||||
# (Set USE_CCACHE=ON to use, CCACHE_OPTIONS for options)
|
|
||||||
if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL Windows)
|
|
||||||
option(USE_CCACHE "Enable ccache support" OFF)
|
|
||||||
|
|
||||||
if(USE_CCACHE)
|
|
||||||
find_program(CCACHE_TOOL_PATH ccache)
|
|
||||||
if(CCACHE_TOOL_PATH)
|
|
||||||
set(CMAKE_C_COMPILER_LAUNCHER ${CCACHE_TOOL_PATH} CACHE STRING "" FORCE)
|
|
||||||
set(CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE_TOOL_PATH} CACHE STRING "" FORCE)
|
|
||||||
else()
|
|
||||||
message(WARNING "USE_CCACHE was set but ccache is not found (set CCACHE_TOOL_PATH)")
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
else()
|
|
||||||
CPMAddPackage(
|
|
||||||
NAME Ccache.cmake
|
|
||||||
GITHUB_REPOSITORY TheLartians/Ccache.cmake
|
|
||||||
VERSION 1.2
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# Dependencies
|
# Dependencies
|
||||||
add_subdirectory(thirdparty)
|
add_subdirectory(thirdparty)
|
||||||
|
|
||||||
if("${SRB2_CONFIG_SYSTEM_LIBRARIES}")
|
if(SRB2_CONFIG_SHARED_INTERNAL_LIBRARIES)
|
||||||
find_package(ZLIB REQUIRED)
|
set(SRB2_INTERNAL_LIBRARY_TYPE SHARED)
|
||||||
find_package(PNG REQUIRED)
|
set(NOT_SRB2_CONFIG_SHARED_INTERNAL_LIBRARIES OFF)
|
||||||
find_package(SDL2 REQUIRED)
|
else()
|
||||||
find_package(SDL2_mixer REQUIRED)
|
set(SRB2_INTERNAL_LIBRARY_TYPE STATIC)
|
||||||
find_package(CURL REQUIRED)
|
set(NOT_SRB2_CONFIG_SHARED_INTERNAL_LIBRARIES ON)
|
||||||
find_package(OPENMPT REQUIRED)
|
|
||||||
|
|
||||||
# libgme defaults to "Nuked" YM2612 emulator, which is
|
|
||||||
# very SLOW. The system library probably uses the
|
|
||||||
# default so just always build it.
|
|
||||||
#find_package(GME REQUIRED)
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
||||||
|
find_package(ZLIB REQUIRED)
|
||||||
|
find_package(PNG REQUIRED)
|
||||||
|
find_package(CURL REQUIRED)
|
||||||
|
find_package(libopenmpt QUIET)
|
||||||
|
if("${SRB2_CONFIG_USE_GME}")
|
||||||
|
find_package(libgme QUIET)
|
||||||
|
endif()
|
||||||
|
find_package(miniupnpc QUIET)
|
||||||
|
|
||||||
|
|
||||||
if(${PROJECT_SOURCE_DIR} MATCHES ${PROJECT_BINARY_DIR})
|
if(${PROJECT_SOURCE_DIR} MATCHES ${PROJECT_BINARY_DIR})
|
||||||
message(FATAL_ERROR "In-source builds will bring you a world of pain. Please make a separate directory to invoke CMake from.")
|
message(FATAL_ERROR "In-source builds will bring you a world of pain. Please make a separate directory to invoke CMake from.")
|
||||||
endif()
|
endif()
|
||||||
|
|
|
||||||
|
|
@ -2,26 +2,263 @@
|
||||||
"version": 3,
|
"version": 3,
|
||||||
"configurePresets": [
|
"configurePresets": [
|
||||||
{
|
{
|
||||||
"name": "default",
|
"name": "__debug",
|
||||||
"description": "Build using default generator",
|
"hidden": true,
|
||||||
"binaryDir": "build",
|
|
||||||
"cacheVariables": {
|
"cacheVariables": {
|
||||||
|
"SRB2_CONFIG_DEV_BUILD": "ON",
|
||||||
|
"CMAKE_BUILD_TYPE": "Debug"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "__develop",
|
||||||
|
"hidden": true,
|
||||||
|
"cacheVariables": {
|
||||||
|
"CMAKE_C_FLAGS_RELWITHDEBINFO": "-DNDEBUG",
|
||||||
|
"CMAKE_CXX_FLAGS_RELWITHDEBINFO": "-DNDEBUG",
|
||||||
|
"SRB2_CONFIG_DEV_BUILD": "ON",
|
||||||
"CMAKE_BUILD_TYPE": "RelWithDebInfo"
|
"CMAKE_BUILD_TYPE": "RelWithDebInfo"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "debug",
|
"name": "__release",
|
||||||
"description": "Build for development (no optimizations)",
|
"hidden": true,
|
||||||
"inherits": "default",
|
|
||||||
"cacheVariables": {
|
"cacheVariables": {
|
||||||
"CMAKE_BUILD_TYPE": "Debug"
|
"CMAKE_C_FLAGS_RELWITHDEBINFO": "-DNDEBUG",
|
||||||
|
"CMAKE_CXX_FLAGS_RELWITHDEBINFO": "-DNDEBUG",
|
||||||
|
"SRB2_CONFIG_DEV_BUILD": "OFF",
|
||||||
|
"CMAKE_BUILD_TYPE": "RelWithDebInfo"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "__testers",
|
||||||
|
"hidden": true,
|
||||||
|
"cacheVariables": {
|
||||||
|
"CMAKE_C_FLAGS_RELWITHDEBINFO": "-DNDEBUG",
|
||||||
|
"CMAKE_CXX_FLAGS_RELWITHDEBINFO": "-DNDEBUG",
|
||||||
|
"SRB2_CONFIG_DEV_BUILD": "ON",
|
||||||
|
"CMAKE_BUILD_TYPE": "RelWithDebInfo",
|
||||||
|
"SRB2_CONFIG_TESTERS": "ON"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "__ninja",
|
||||||
|
"hidden": true,
|
||||||
|
"generator": "Ninja",
|
||||||
|
"cacheVariables": {
|
||||||
|
"CMAKE_COLOR_DIAGNOSTICS": "ON"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "__vcpkg-toolchain",
|
||||||
|
"hidden": true,
|
||||||
|
"cacheVariables": {
|
||||||
|
"CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "__compiler-mingw-w64-i686",
|
||||||
|
"hidden": true,
|
||||||
|
"cacheVariables": {
|
||||||
|
"CMAKE_C_COMPILER": "i686-w64-mingw32-gcc",
|
||||||
|
"CMAKE_CXX_COMPILER": "i686-w64-mingw32-g++"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "__mingw-dynamic",
|
||||||
|
"hidden": true,
|
||||||
|
"cacheVariables": {
|
||||||
|
"VCPKG_TARGET_TRIPLET": "x86-mingw-dynamic"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "__mingw-static",
|
||||||
|
"hidden": true,
|
||||||
|
"cacheVariables": {
|
||||||
|
"VCPKG_HOST_TRIPLET": "x86-mingw-static",
|
||||||
|
"VCPKG_TARGET_TRIPLET": "x86-mingw-static"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "__osx_x64",
|
||||||
|
"hidden": true,
|
||||||
|
"cacheVariables": {
|
||||||
|
"VCPKG_TARGET_TRIPLET": "x64-osx"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "__osx_arm64",
|
||||||
|
"hidden": true,
|
||||||
|
"cacheVariables": {
|
||||||
|
"VCPKG_TARGET_TRIPLET": "arm64-osx"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"name": "ninja-debug",
|
||||||
|
"hidden": false,
|
||||||
|
"binaryDir": "build/${presetName}",
|
||||||
|
"inherits": ["__debug", "__ninja"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "ninja-develop",
|
||||||
|
"hidden": false,
|
||||||
|
"binaryDir": "build/${presetName}",
|
||||||
|
"inherits": ["__develop", "__ninja"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "ninja-release",
|
||||||
|
"hidden": false,
|
||||||
|
"binaryDir": "build/${presetName}",
|
||||||
|
"inherits": ["__release", "__ninja"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "ninja-testers",
|
||||||
|
"hidden": false,
|
||||||
|
"binaryDir": "build/${presetName}",
|
||||||
|
"inherits": ["__testers", "__ninja"]
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"name": "ninja-vcpkg-debug",
|
||||||
|
"hidden": false,
|
||||||
|
"binaryDir": "build/${presetName}",
|
||||||
|
"inherits": ["__debug", "__ninja", "__vcpkg-toolchain"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "ninja-vcpkg-develop",
|
||||||
|
"hidden": false,
|
||||||
|
"binaryDir": "build/${presetName}",
|
||||||
|
"inherits": ["__develop", "__ninja", "__vcpkg-toolchain"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "ninja-vcpkg-release",
|
||||||
|
"hidden": false,
|
||||||
|
"binaryDir": "build/${presetName}",
|
||||||
|
"inherits": ["__release", "__ninja", "__vcpkg-toolchain"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "ninja-vcpkg-testers",
|
||||||
|
"hidden": false,
|
||||||
|
"binaryDir": "build/${presetName}",
|
||||||
|
"inherits": ["__testers", "__ninja", "__vcpkg-toolchain"]
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"name": "ninja-x86_mingw_static_vcpkg-debug",
|
||||||
|
"hidden": false,
|
||||||
|
"binaryDir": "build/${presetName}",
|
||||||
|
"inherits": ["__debug", "__compiler-mingw-w64-i686", "__ninja", "__vcpkg-toolchain", "__mingw-static"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "ninja-x86_mingw_static_vcpkg-develop",
|
||||||
|
"hidden": false,
|
||||||
|
"binaryDir": "build/${presetName}",
|
||||||
|
"inherits": ["__develop", "__compiler-mingw-w64-i686", "__ninja", "__vcpkg-toolchain", "__mingw-static"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "ninja-x86_mingw_static_vcpkg-release",
|
||||||
|
"hidden": false,
|
||||||
|
"binaryDir": "build/${presetName}",
|
||||||
|
"inherits": ["__release", "__compiler-mingw-w64-i686", "__ninja", "__vcpkg-toolchain", "__mingw-static"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "ninja-x86_mingw_static_vcpkg-testers",
|
||||||
|
"hidden": false,
|
||||||
|
"binaryDir": "build/${presetName}",
|
||||||
|
"inherits": ["__testers", "__compiler-mingw-w64-i686", "__ninja", "__vcpkg-toolchain", "__mingw-static"]
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"name": "ninja-x64_osx_vcpkg-debug",
|
||||||
|
"hidden": false,
|
||||||
|
"binaryDir": "build/${presetName}",
|
||||||
|
"inherits": ["__debug", "__ninja", "__vcpkg-toolchain", "__osx_x64"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "ninja-x64_osx_vcpkg-develop",
|
||||||
|
"hidden": false,
|
||||||
|
"binaryDir": "build/${presetName}",
|
||||||
|
"inherits": ["__develop", "__ninja", "__vcpkg-toolchain", "__osx_x64"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "ninja-x64_osx_vcpkg-release",
|
||||||
|
"hidden": false,
|
||||||
|
"binaryDir": "build/${presetName}",
|
||||||
|
"inherits": ["__release", "__ninja", "__vcpkg-toolchain", "__osx_x64"]
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"name": "ninja-arm64_osx_vcpkg-debug",
|
||||||
|
"hidden": false,
|
||||||
|
"binaryDir": "build/${presetName}",
|
||||||
|
"inherits": ["__debug", "__ninja", "__vcpkg-toolchain", "__osx_arm64"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "ninja-arm64_osx_vcpkg-develop",
|
||||||
|
"hidden": false,
|
||||||
|
"binaryDir": "build/${presetName}",
|
||||||
|
"inherits": ["__develop", "__ninja", "__vcpkg-toolchain", "__osx_arm64"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "ninja-arm64_osx_vcpkg-release",
|
||||||
|
"hidden": false,
|
||||||
|
"binaryDir": "build/${presetName}",
|
||||||
|
"inherits": ["__release", "__ninja", "__vcpkg-toolchain", "__osx_arm64"]
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
|
||||||
"buildPresets": [
|
"buildPresets": [
|
||||||
{
|
{
|
||||||
"name": "default",
|
"name": "ninja-debug",
|
||||||
"configurePreset": "default"
|
"configurePreset": "ninja-debug"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "ninja-develop",
|
||||||
|
"configurePreset": "ninja-develop"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "ninja-release",
|
||||||
|
"configurePreset": "ninja-release"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "ninja-x86_mingw_static_vcpkg-debug",
|
||||||
|
"configurePreset": "ninja-x86_mingw_static_vcpkg-debug"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "ninja-x86_mingw_static_vcpkg-develop",
|
||||||
|
"configurePreset": "ninja-x86_mingw_static_vcpkg-develop"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "ninja-x86_mingw_static_vcpkg-release",
|
||||||
|
"configurePreset": "ninja-x86_mingw_static_vcpkg-release"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "ninja-x86_mingw_static_vcpkg-testers",
|
||||||
|
"configurePreset": "ninja-x86_mingw_static_vcpkg-testers"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "ninja-x64_osx_vcpkg-debug",
|
||||||
|
"configurePreset": "ninja-x64_osx_vcpkg-debug"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "ninja-x64_osx_vcpkg-develop",
|
||||||
|
"configurePreset": "ninja-x64_osx_vcpkg-develop"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "ninja-x64_osx_vcpkg-release",
|
||||||
|
"configurePreset": "ninja-x64_osx_vcpkg-release"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "ninja-arm64_osx_vcpkg-debug",
|
||||||
|
"configurePreset": "ninja-arm64_osx_vcpkg-debug"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "ninja-arm64_osx_vcpkg-develop",
|
||||||
|
"configurePreset": "ninja-arm64_osx_vcpkg-develop"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "ninja-arm64_osx_vcpkg-release",
|
||||||
|
"configurePreset": "ninja-arm64_osx_vcpkg-release"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
@ -1,21 +0,0 @@
|
||||||
set(CPM_DOWNLOAD_VERSION 0.38.7)
|
|
||||||
|
|
||||||
if(CPM_SOURCE_CACHE)
|
|
||||||
set(CPM_DOWNLOAD_LOCATION "${CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
|
|
||||||
elseif(DEFINED ENV{CPM_SOURCE_CACHE})
|
|
||||||
set(CPM_DOWNLOAD_LOCATION "$ENV{CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
|
|
||||||
else()
|
|
||||||
set(CPM_DOWNLOAD_LOCATION "${CMAKE_BINARY_DIR}/cmake/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# Expand relative path. This is important if the provided path contains a tilde (~)
|
|
||||||
get_filename_component(CPM_DOWNLOAD_LOCATION ${CPM_DOWNLOAD_LOCATION} ABSOLUTE)
|
|
||||||
if(NOT (EXISTS ${CPM_DOWNLOAD_LOCATION}))
|
|
||||||
message(STATUS "Downloading CPM.cmake to ${CPM_DOWNLOAD_LOCATION}")
|
|
||||||
file(DOWNLOAD
|
|
||||||
https://github.com/cpm-cmake/CPM.cmake/releases/download/v${CPM_DOWNLOAD_VERSION}/CPM.cmake
|
|
||||||
${CPM_DOWNLOAD_LOCATION}
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
include(${CPM_DOWNLOAD_LOCATION})
|
|
||||||
|
|
@ -1,33 +0,0 @@
|
||||||
include(LibFindMacros)
|
|
||||||
|
|
||||||
libfind_pkg_check_modules(GME_PKGCONF GME)
|
|
||||||
|
|
||||||
find_path(GME_INCLUDE_DIR
|
|
||||||
NAMES gme.h
|
|
||||||
PATHS
|
|
||||||
${GME_PKGCONF_INCLUDE_DIRS}
|
|
||||||
"/usr/include/gme"
|
|
||||||
"/usr/local/include/gme"
|
|
||||||
)
|
|
||||||
|
|
||||||
find_library(GME_LIBRARY
|
|
||||||
NAMES gme
|
|
||||||
PATHS
|
|
||||||
${GME_PKGCONF_LIBRARY_DIRS}
|
|
||||||
"/usr/lib"
|
|
||||||
"/usr/local/lib"
|
|
||||||
)
|
|
||||||
|
|
||||||
set(GME_PROCESS_INCLUDES GME_INCLUDE_DIR)
|
|
||||||
set(GME_PROCESS_LIBS GME_LIBRARY)
|
|
||||||
libfind_process(GME)
|
|
||||||
|
|
||||||
if(GME_FOUND AND NOT TARGET gme)
|
|
||||||
add_library(gme UNKNOWN IMPORTED)
|
|
||||||
set_target_properties(
|
|
||||||
gme
|
|
||||||
PROPERTIES
|
|
||||||
IMPORTED_LOCATION "${GME_LIBRARY}"
|
|
||||||
INTERFACE_INCLUDE_DIRECTORIES "${GME_INCLUDE_DIR}"
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
|
|
@ -1,33 +0,0 @@
|
||||||
include(LibFindMacros)
|
|
||||||
|
|
||||||
libfind_pkg_check_modules(OPENMPT_PKGCONF OPENMPT)
|
|
||||||
|
|
||||||
find_path(OPENMPT_INCLUDE_DIR
|
|
||||||
NAMES libopenmpt.h
|
|
||||||
PATHS
|
|
||||||
${OPENMPT_PKGCONF_INCLUDE_DIRS}
|
|
||||||
"/usr/include/libopenmpt"
|
|
||||||
"/usr/local/include/libopenmpt"
|
|
||||||
)
|
|
||||||
|
|
||||||
find_library(OPENMPT_LIBRARY
|
|
||||||
NAMES openmpt
|
|
||||||
PATHS
|
|
||||||
${OPENMPT_PKGCONF_LIBRARY_DIRS}
|
|
||||||
"/usr/lib"
|
|
||||||
"/usr/local/lib"
|
|
||||||
)
|
|
||||||
|
|
||||||
set(OPENMPT_PROCESS_INCLUDES OPENMPT_INCLUDE_DIR)
|
|
||||||
set(OPENMPT_PROCESS_LIBS OPENMPT_LIBRARY)
|
|
||||||
libfind_process(OPENMPT)
|
|
||||||
|
|
||||||
if(OPENMPT_FOUND AND NOT TARGET openmpt)
|
|
||||||
add_library(openmpt UNKNOWN IMPORTED)
|
|
||||||
set_target_properties(
|
|
||||||
openmpt
|
|
||||||
PROPERTIES
|
|
||||||
IMPORTED_LOCATION "${OPENMPT_LIBRARY}"
|
|
||||||
INTERFACE_INCLUDE_DIRECTORIES "${OPENMPT_INCLUDE_DIR}"
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
38
cmake/Modules/Findlibgme.cmake
Normal file
38
cmake/Modules/Findlibgme.cmake
Normal file
|
|
@ -0,0 +1,38 @@
|
||||||
|
include(LibFindMacros)
|
||||||
|
|
||||||
|
libfind_pkg_check_modules(libgme_PKGCONF gme libgme)
|
||||||
|
|
||||||
|
find_path(libgme_INCLUDE_DIR
|
||||||
|
NAMES gme.h
|
||||||
|
PATHS
|
||||||
|
${libgme_PKGCONF_INCLUDE_DIRS}
|
||||||
|
"/usr/include"
|
||||||
|
"/usr/local/include"
|
||||||
|
PATH_SUFFIXES
|
||||||
|
gme
|
||||||
|
)
|
||||||
|
|
||||||
|
find_library(libgme_LIBRARY
|
||||||
|
NAMES gme
|
||||||
|
PATHS
|
||||||
|
${libgme_PKGCONF_LIBRARY_DIRS}
|
||||||
|
"/usr/lib"
|
||||||
|
"/usr/local/lib"
|
||||||
|
)
|
||||||
|
|
||||||
|
include(FindPackageHandleStandardArgs)
|
||||||
|
FIND_PACKAGE_HANDLE_STANDARD_ARGS(libgme
|
||||||
|
REQUIRED_VARS libgme_LIBRARY libgme_INCLUDE_DIR)
|
||||||
|
|
||||||
|
if(libgme_FOUND AND NOT TARGET gme)
|
||||||
|
add_library(gme UNKNOWN IMPORTED)
|
||||||
|
set_target_properties(
|
||||||
|
gme
|
||||||
|
PROPERTIES
|
||||||
|
IMPORTED_LOCATION "${libgme_LIBRARY}"
|
||||||
|
INTERFACE_INCLUDE_DIRECTORIES "${libgme_INCLUDE_DIR}"
|
||||||
|
)
|
||||||
|
add_library(gme::gme ALIAS gme)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
mark_as_advanced(libgme_LIBRARY libgme_INCLUDE_DIR)
|
||||||
37
cmake/Modules/Findlibopenmpt.cmake
Normal file
37
cmake/Modules/Findlibopenmpt.cmake
Normal file
|
|
@ -0,0 +1,37 @@
|
||||||
|
include(LibFindMacros)
|
||||||
|
|
||||||
|
libfind_pkg_check_modules(libopenmpt_PKGCONF openmpt)
|
||||||
|
|
||||||
|
find_path(libopenmpt_INCLUDE_DIR
|
||||||
|
NAMES libopenmpt.h
|
||||||
|
PATHS
|
||||||
|
${libopenmpt_PKGCONF_INCLUDE_DIRS}
|
||||||
|
"${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include/libopenmpt"
|
||||||
|
"/usr/include/libopenmpt"
|
||||||
|
"/usr/local/include/libopenmpt"
|
||||||
|
)
|
||||||
|
|
||||||
|
find_library(libopenmpt_LIBRARY
|
||||||
|
NAMES openmpt
|
||||||
|
PATHS
|
||||||
|
${libopenmpt_PKGCONF_LIBRARY_DIRS}
|
||||||
|
"/usr/lib"
|
||||||
|
"/usr/local/lib"
|
||||||
|
)
|
||||||
|
|
||||||
|
include(FindPackageHandleStandardArgs)
|
||||||
|
FIND_PACKAGE_HANDLE_STANDARD_ARGS(libopenmpt
|
||||||
|
REQUIRED_VARS libopenmpt_LIBRARY libopenmpt_INCLUDE_DIR)
|
||||||
|
|
||||||
|
if(libopenmpt_FOUND AND NOT TARGET openmpt)
|
||||||
|
add_library(openmpt UNKNOWN IMPORTED)
|
||||||
|
set_target_properties(
|
||||||
|
openmpt
|
||||||
|
PROPERTIES
|
||||||
|
IMPORTED_LOCATION "${libopenmpt_LIBRARY}"
|
||||||
|
INTERFACE_INCLUDE_DIRECTORIES "${libopenmpt_INCLUDE_DIR}"
|
||||||
|
)
|
||||||
|
add_library(libopenmpt::libopenmpt ALIAS openmpt)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
mark_as_advanced(libopenmpt_LIBRARY libopenmpt_INCLUDE_DIR)
|
||||||
39
cmake/Modules/Findminiupnpc.cmake
Normal file
39
cmake/Modules/Findminiupnpc.cmake
Normal file
|
|
@ -0,0 +1,39 @@
|
||||||
|
include(LibFindMacros)
|
||||||
|
|
||||||
|
libfind_pkg_check_modules(libminiupnpc_PKGCONF miniupnpc libminiupnpc)
|
||||||
|
|
||||||
|
find_path(libminiupnpc_INCLUDE_DIR
|
||||||
|
NAMES miniupnpc.h
|
||||||
|
PATHS
|
||||||
|
${libminiupnpc_PKGCONF_INCLUDE_DIRS}
|
||||||
|
"${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include"
|
||||||
|
"/usr/include"
|
||||||
|
"/usr/local/include"
|
||||||
|
PATH_SUFFIXES
|
||||||
|
miniupnpc
|
||||||
|
)
|
||||||
|
|
||||||
|
find_library(libminiupnpc_LIBRARY
|
||||||
|
NAMES miniupnpc
|
||||||
|
PATHS
|
||||||
|
${libminiupnpc_PKGCONF_LIBRARY_DIRS}
|
||||||
|
"/usr/lib"
|
||||||
|
"/usr/local/lib"
|
||||||
|
)
|
||||||
|
|
||||||
|
include(FindPackageHandleStandardArgs)
|
||||||
|
FIND_PACKAGE_HANDLE_STANDARD_ARGS(miniupnpc
|
||||||
|
REQUIRED_VARS libminiupnpc_LIBRARY libminiupnpc_INCLUDE_DIR)
|
||||||
|
|
||||||
|
if(miniupnpc_FOUND AND NOT TARGET miniupnpc)
|
||||||
|
add_library(miniupnpc UNKNOWN IMPORTED)
|
||||||
|
set_target_properties(
|
||||||
|
miniupnpc
|
||||||
|
PROPERTIES
|
||||||
|
IMPORTED_LOCATION "${libminiupnpc_LIBRARY}"
|
||||||
|
INTERFACE_INCLUDE_DIRECTORIES "${libminiupnpc_INCLUDE_DIR}"
|
||||||
|
)
|
||||||
|
add_library(miniupnpc::miniupnpc ALIAS miniupnpc)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
mark_as_advanced(libminiupnpc_LIBRARY libminiupnpc_INCLUDE_DIR)
|
||||||
30
cmake/PatchFile.cmake
Normal file
30
cmake/PatchFile.cmake
Normal file
|
|
@ -0,0 +1,30 @@
|
||||||
|
# use GNU Patch from any platform
|
||||||
|
|
||||||
|
if(WIN32)
|
||||||
|
# prioritize Git Patch on Windows as other Patches may be very old and incompatible.
|
||||||
|
find_package(Git)
|
||||||
|
if(Git_FOUND)
|
||||||
|
get_filename_component(GIT_DIR ${GIT_EXECUTABLE} DIRECTORY)
|
||||||
|
get_filename_component(GIT_DIR ${GIT_DIR} DIRECTORY)
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
find_program(PATCH
|
||||||
|
NAMES patch
|
||||||
|
HINTS ${GIT_DIR}
|
||||||
|
PATH_SUFFIXES usr/bin
|
||||||
|
)
|
||||||
|
|
||||||
|
if(NOT PATCH)
|
||||||
|
message(FATAL_ERROR "Did not find GNU Patch")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
execute_process(COMMAND ${PATCH} ${in_file} --input=${patch_file} --output=${out_file} --ignore-whitespace
|
||||||
|
TIMEOUT 15
|
||||||
|
COMMAND_ECHO STDOUT
|
||||||
|
RESULT_VARIABLE ret
|
||||||
|
)
|
||||||
|
|
||||||
|
if(NOT ret EQUAL 0)
|
||||||
|
message(FATAL_ERROR "Failed to apply patch ${patch_file} to ${in_file} with ${PATCH}")
|
||||||
|
endif()
|
||||||
16
cmake/Toolchains/mingw-w64-i686.cmake
Normal file
16
cmake/Toolchains/mingw-w64-i686.cmake
Normal file
|
|
@ -0,0 +1,16 @@
|
||||||
|
set(CMAKE_SYSTEM_NAME Windows)
|
||||||
|
set(TOOLCHAIN_PREFIX i686-w64-mingw32)
|
||||||
|
|
||||||
|
# cross compilers to use for C, C++ and Fortran
|
||||||
|
set(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}-gcc)
|
||||||
|
set(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}-g++)
|
||||||
|
set(CMAKE_Fortran_COMPILER ${TOOLCHAIN_PREFIX}-gfortran)
|
||||||
|
set(CMAKE_RC_COMPILER ${TOOLCHAIN_PREFIX}-windres)
|
||||||
|
|
||||||
|
# target environment on the build host system
|
||||||
|
set(CMAKE_FIND_ROOT_PATH /usr/${TOOLCHAIN_PREFIX})
|
||||||
|
|
||||||
|
# modify default behavior of FIND_XXX() commands
|
||||||
|
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
|
||||||
|
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
|
||||||
|
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
|
||||||
16
cmake/Toolchains/mingw-w64-x86_64.cmake
Normal file
16
cmake/Toolchains/mingw-w64-x86_64.cmake
Normal file
|
|
@ -0,0 +1,16 @@
|
||||||
|
set(CMAKE_SYSTEM_NAME Windows)
|
||||||
|
set(TOOLCHAIN_PREFIX x86_64-w64-mingw32)
|
||||||
|
|
||||||
|
# cross compilers to use for C, C++ and Fortran
|
||||||
|
set(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}-gcc)
|
||||||
|
set(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}-g++)
|
||||||
|
set(CMAKE_Fortran_COMPILER ${TOOLCHAIN_PREFIX}-gfortran)
|
||||||
|
set(CMAKE_RC_COMPILER ${TOOLCHAIN_PREFIX}-windres)
|
||||||
|
|
||||||
|
# target environment on the build host system
|
||||||
|
set(CMAKE_FIND_ROOT_PATH /usr/${TOOLCHAIN_PREFIX})
|
||||||
|
|
||||||
|
# modify default behavior of FIND_XXX() commands
|
||||||
|
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
|
||||||
|
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
|
||||||
|
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
|
||||||
|
|
@ -134,10 +134,13 @@ add_dependencies(SRB2SDL2 _SRB2_reconf)
|
||||||
|
|
||||||
if("${CMAKE_COMPILER_IS_GNUCC}" AND "${CMAKE_SYSTEM_NAME}" MATCHES "Windows")
|
if("${CMAKE_COMPILER_IS_GNUCC}" AND "${CMAKE_SYSTEM_NAME}" MATCHES "Windows")
|
||||||
target_link_options(SRB2SDL2 PRIVATE "-Wl,--disable-dynamicbase")
|
target_link_options(SRB2SDL2 PRIVATE "-Wl,--disable-dynamicbase")
|
||||||
if(NOT "${SRB2_CONFIG_SYSTEM_LIBRARIES}" AND NOT "${SRB2_CONFIG_SHARED_INTERNAL_LIBRARIES}")
|
if("${SRB2_CONFIG_STATIC_STDLIB}")
|
||||||
# On MinGW with internal libraries, link the standard library statically
|
# On MinGW with internal libraries, link the standard library statically
|
||||||
target_link_options(SRB2SDL2 PRIVATE "-static")
|
target_link_options(SRB2SDL2 PRIVATE "-static")
|
||||||
endif()
|
endif()
|
||||||
|
if(CMAKE_SIZEOF_VOID_P EQUAL 4)
|
||||||
|
target_link_options(SRB2SDL2 PRIVATE "-Wl,--large-address-aware")
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
target_compile_features(SRB2SDL2 PRIVATE c_std_11 cxx_std_17)
|
target_compile_features(SRB2SDL2 PRIVATE c_std_11 cxx_std_17)
|
||||||
|
|
@ -182,12 +185,7 @@ if("${SRB2_CONFIG_USE_GME}")
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
target_link_libraries(SRB2SDL2 PRIVATE openmpt)
|
target_compile_definitions(SRB2SDL2 PRIVATE -D_LARGEFILE64_SOURCE)
|
||||||
target_compile_definitions(SRB2SDL2 PRIVATE -DHAVE_OPENMPT)
|
|
||||||
|
|
||||||
target_link_libraries(SRB2SDL2 PRIVATE ZLIB::ZLIB PNG::PNG CURL::libcurl)
|
|
||||||
target_compile_definitions(SRB2SDL2 PRIVATE -DHAVE_ZLIB -DHAVE_PNG -DHAVE_CURL -D_LARGEFILE64_SOURCE)
|
|
||||||
target_sources(SRB2SDL2 PRIVATE apng.c)
|
|
||||||
|
|
||||||
set(SRB2_HAVE_THREADS ON)
|
set(SRB2_HAVE_THREADS ON)
|
||||||
target_compile_definitions(SRB2SDL2 PRIVATE -DHAVE_THREADS)
|
target_compile_definitions(SRB2SDL2 PRIVATE -DHAVE_THREADS)
|
||||||
|
|
@ -403,8 +401,66 @@ if(SRB2_CONFIG_PROFILEMODE AND "${CMAKE_C_COMPILER_ID}" STREQUAL "GNU")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_subdirectory(sdl)
|
add_subdirectory(sdl)
|
||||||
if(SRB2_CONFIG_ENABLE_TESTS)
|
|
||||||
add_subdirectory(tests)
|
if(TARGET ZLIB::ZLIB)
|
||||||
|
target_compile_definitions(SRB2SDL2 PRIVATE -DHAVE_ZLIB)
|
||||||
|
message(STATUS "Zlib Found")
|
||||||
|
else()
|
||||||
|
message(STATUS "No Zlib Found")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(TARGET PNG::PNG)
|
||||||
|
target_compile_definitions(SRB2SDL2 PRIVATE -DHAVE_PNG)
|
||||||
|
target_sources(SRB2SDL2 PRIVATE apng.c ${libapng_HEADER})
|
||||||
|
target_include_directories(SRB2SDL2 PRIVATE ${libapng_INCLUDE_DIRS} ${libpng_BINARY_DIR})
|
||||||
|
#message(STATUS "libpng inc DIRS at ${libapng_INCLUDE_DIRS}")
|
||||||
|
#message(STATUS "libpng bin DIRS at ${libpng_BINARY_DIR}")
|
||||||
|
#message(STATUS "png.h at ${libapng_HEADER}")
|
||||||
|
message(STATUS "libpng Found")
|
||||||
|
else()
|
||||||
|
message(STATUS "No libpng Found")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(TARGET PNG::PNG AND TARGET ZLIB::ZLIB)
|
||||||
|
#libpng links zlib too?
|
||||||
|
target_link_libraries(SRB2SDL2 PRIVATE PNG::PNG)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(NOT TARGET PNG::PNG AND TARGET ZLIB::ZLIB)
|
||||||
|
#got no libpng? we need zlib
|
||||||
|
target_link_libraries(SRB2SDL2 PRIVATE ZLIB::ZLIB)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(TARGET gme::gme)
|
||||||
|
target_compile_definitions(SRB2SDL2 PRIVATE -DHAVE_GME)
|
||||||
|
target_link_libraries(SRB2SDL2 PRIVATE gme::gme)
|
||||||
|
message(STATUS "libgme Found")
|
||||||
|
else()
|
||||||
|
message(STATUS "No libgme Found")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(TARGET libopenmpt::libopenmpt)
|
||||||
|
target_compile_definitions(SRB2SDL2 PRIVATE -DHAVE_OPENMPT)
|
||||||
|
target_link_libraries(SRB2SDL2 PRIVATE libopenmpt::libopenmpt)
|
||||||
|
message(STATUS "libopenmpt Found")
|
||||||
|
else()
|
||||||
|
message(STATUS "No libopenmpt Found")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(TARGET CURL::libcurl)
|
||||||
|
target_compile_definitions(SRB2SDL2 PRIVATE -DHAVE_CURL)
|
||||||
|
target_link_libraries(SRB2SDL2 PRIVATE CURL::libcurl)
|
||||||
|
message(STATUS "libcurl Found")
|
||||||
|
else()
|
||||||
|
message(STATUS "No libcurl Found")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(TARGET miniupnpc::miniupnpc)
|
||||||
|
target_compile_definitions(SRB2SDL2 PRIVATE -DHAVE_MINIUPNPC)
|
||||||
|
target_link_libraries(SRB2SDL2 PRIVATE miniupnpc::miniupnpc)
|
||||||
|
message(STATUS "miniupnpc Found")
|
||||||
|
else()
|
||||||
|
message(STATUS "No miniupnpc Found")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# strip debug symbols into separate file when using gcc.
|
# strip debug symbols into separate file when using gcc.
|
||||||
|
|
|
||||||
|
|
@ -114,16 +114,10 @@ typedef union
|
||||||
} mysockaddr_t;
|
} mysockaddr_t;
|
||||||
|
|
||||||
#ifdef HAVE_MINIUPNPC
|
#ifdef HAVE_MINIUPNPC
|
||||||
#ifdef MINIUPNP_STATICLIB
|
#include "miniupnpc/miniwget.h"
|
||||||
#include "miniwget.h"
|
#include "miniupnpc/miniupnpc.h"
|
||||||
#include "miniupnpc.h"
|
#include "miniupnpc/upnpcommands.h"
|
||||||
#include "upnpcommands.h"
|
static boolean UPNP_support = true;
|
||||||
#else
|
|
||||||
#include "miniupnpc/miniwget.h"
|
|
||||||
#include "miniupnpc/miniupnpc.h"
|
|
||||||
#include "miniupnpc/upnpcommands.h"
|
|
||||||
#endif
|
|
||||||
static boolean UPNP_support = true;
|
|
||||||
#endif // HAVE_MINIUPNC
|
#endif // HAVE_MINIUPNC
|
||||||
|
|
||||||
#define MAXBANS 100
|
#define MAXBANS 100
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
# Declare SDL2 interface sources
|
# Declare SDL2 interface sources
|
||||||
|
|
||||||
target_sources(SRB2SDL2 PRIVATE
|
target_sources(SRB2SDL2 PRIVATE
|
||||||
mixer_sound.c
|
|
||||||
ogl_sdl.c
|
ogl_sdl.c
|
||||||
i_threads.c
|
i_threads.c
|
||||||
i_net.c
|
i_net.c
|
||||||
|
|
@ -13,6 +12,161 @@ target_sources(SRB2SDL2 PRIVATE
|
||||||
hwsym_sdl.c
|
hwsym_sdl.c
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# Compatibility flag with later versions of GCC
|
||||||
|
# We should really fix our code to not need this
|
||||||
|
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
|
||||||
|
target_compile_options(SRB2SDL2 PRIVATE -mno-ms-bitfields)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
# Yes we know we use insecure CRT functions...
|
||||||
|
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
|
||||||
|
target_compile_definitions(SRB2SDL2 PRIVATE -D_CRT_SECURE_NO_WARNINGS)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
# Compiler warnings configuration
|
||||||
|
target_compile_options(SRB2SDL2 PRIVATE
|
||||||
|
# Using generator expressions to handle per-language compile options
|
||||||
|
|
||||||
|
# C, GNU
|
||||||
|
# This is a direct translation from versions.mk
|
||||||
|
$<$<AND:$<COMPILE_LANGUAGE:C>,$<C_COMPILER_ID:GNU>>:
|
||||||
|
-Wall
|
||||||
|
-Wno-trigraphs
|
||||||
|
-W # Was controlled by RELAXWARNINGS
|
||||||
|
-pedantic
|
||||||
|
-Wpedantic
|
||||||
|
-Wfloat-equal
|
||||||
|
-Wundef
|
||||||
|
-Wpointer-arith
|
||||||
|
-Wbad-function-cast
|
||||||
|
-Wcast-qual
|
||||||
|
-Wcast-align # Was controlled by NOCASTALIGNWARN
|
||||||
|
-Wwrite-strings
|
||||||
|
-Wsign-compare
|
||||||
|
-Wmissing-prototypes
|
||||||
|
-Wmissing-declarations
|
||||||
|
-Wmissing-noreturn
|
||||||
|
-Winline
|
||||||
|
-Wformat-y2k
|
||||||
|
-Wformat-security
|
||||||
|
|
||||||
|
$<$<VERSION_LESS:$<C_COMPILER_VERSION>,2.9.5>:
|
||||||
|
-Wno-div-by-zero
|
||||||
|
-Wendif-labels
|
||||||
|
-Wdisabled-optimization
|
||||||
|
>
|
||||||
|
|
||||||
|
$<$<VERSION_GREATER_EQUAL:$<C_COMPILER_VERSION>,4.0.0>:
|
||||||
|
-Wold-style-definition
|
||||||
|
-Wmissing-field-initializers
|
||||||
|
>
|
||||||
|
|
||||||
|
$<$<VERSION_GREATER_EQUAL:$<C_COMPILER_VERSION>,4.1.0>:
|
||||||
|
-Wshadow
|
||||||
|
>
|
||||||
|
|
||||||
|
$<$<VERSION_GREATER_EQUAL:$<C_COMPILER_VERSION>,4.3.0>:
|
||||||
|
-funit-at-a-time
|
||||||
|
-Wlogical-op
|
||||||
|
>
|
||||||
|
|
||||||
|
$<$<VERSION_GREATER_EQUAL:$<C_COMPILER_VERSION>,4.5.0>:
|
||||||
|
-Wlogical-op
|
||||||
|
-Wno-error=array-bounds
|
||||||
|
>
|
||||||
|
|
||||||
|
$<$<VERSION_GREATER_EQUAL:$<C_COMPILER_VERSION>,4.6.0>:
|
||||||
|
-Wno-suggest-attribute=noreturn
|
||||||
|
-Wno-error=suggest-attribute=noreturn
|
||||||
|
-Werror=vla
|
||||||
|
>
|
||||||
|
|
||||||
|
$<$<VERSION_GREATER_EQUAL:$<C_COMPILER_VERSION>,5.4.0>:
|
||||||
|
-Wno-logical-op
|
||||||
|
-Wno-error=logical-op
|
||||||
|
>
|
||||||
|
|
||||||
|
$<$<VERSION_GREATER_EQUAL:$<C_COMPILER_VERSION>,6.1.0>:
|
||||||
|
-Wno-tautological-compare
|
||||||
|
-Wno-error=tautological-compare
|
||||||
|
>
|
||||||
|
|
||||||
|
$<$<VERSION_GREATER_EQUAL:$<C_COMPILER_VERSION>,7.1.0>:
|
||||||
|
-Wno-error=format-overflow=2
|
||||||
|
-Wimplicit-fallthrough=4
|
||||||
|
>
|
||||||
|
|
||||||
|
$<$<VERSION_GREATER_EQUAL:$<C_COMPILER_VERSION>,8.1.0>:
|
||||||
|
-Wno-error=format-overflow
|
||||||
|
-Wno-error=stringop-truncation
|
||||||
|
-Wno-error=stringop-overflow
|
||||||
|
-Wno-format-overflow
|
||||||
|
-Wno-stringop-truncation
|
||||||
|
-Wno-stringop-overflow
|
||||||
|
-Wno-error=multistatement-macros
|
||||||
|
>
|
||||||
|
|
||||||
|
$<$<VERSION_GREATER_EQUAL:$<C_COMPILER_VERSION>,9.1.0>:
|
||||||
|
-Wno-error=address-of-packed-member
|
||||||
|
>
|
||||||
|
>
|
||||||
|
|
||||||
|
# C, Clang and Apple Clang
|
||||||
|
$<$<AND:$<COMPILE_LANGUAGE:C>,$<OR:$<C_COMPILER_ID:AppleClang>,$<C_COMPILER_ID:Clang>>>:
|
||||||
|
-Wall
|
||||||
|
-Wno-absolute-value
|
||||||
|
-Wno-trigraphs
|
||||||
|
-Wno-error=non-literal-null-conversion
|
||||||
|
-Wno-error=constant-conversion
|
||||||
|
-Wno-unused-but-set-variable
|
||||||
|
-Wno-error=unused-but-set-variable
|
||||||
|
-Wno-shorten-64-to-32
|
||||||
|
>
|
||||||
|
|
||||||
|
# C, MSVC
|
||||||
|
$<$<AND:$<COMPILE_LANGUAGE:C>,$<C_COMPILER_ID:MSVC>>:
|
||||||
|
# All warnings at and before Visual Studio 2019 RTM
|
||||||
|
# https://learn.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warnings-by-compiler-version?view=msvc-170
|
||||||
|
/Wv:19.20.27004.0
|
||||||
|
>
|
||||||
|
|
||||||
|
# C++, GNU, Clang and Apple Clang
|
||||||
|
$<$<AND:$<COMPILE_LANGUAGE:CXX>,$<OR:$<C_COMPILER_ID:GNU>,$<C_COMPILER_ID:AppleClang>,$<C_COMPILER_ID:Clang>>>:
|
||||||
|
-Wall
|
||||||
|
-Wno-unused-function
|
||||||
|
-Wno-unused-but-set-variable
|
||||||
|
-Wno-unused-private-field
|
||||||
|
>
|
||||||
|
|
||||||
|
# C++, MSVC
|
||||||
|
$<$<AND:$<COMPILE_LANGUAGE:CXX>,$<C_COMPILER_ID:MSVC>>:
|
||||||
|
/Wv:19.20.27004.0
|
||||||
|
>
|
||||||
|
|
||||||
|
# GNU
|
||||||
|
$<$<C_COMPILER_ID:GNU>:
|
||||||
|
-fmax-errors=5
|
||||||
|
>
|
||||||
|
)
|
||||||
|
if(SRB2_CONFIG_ERRORMODE)
|
||||||
|
target_compile_options(SRB2SDL2 PRIVATE
|
||||||
|
$<$<OR:$<C_COMPILER_ID:GNU>,$<C_COMPILER_ID:AppleClang>,$<C_COMPILER_ID:Clang>>:
|
||||||
|
-Werror
|
||||||
|
>
|
||||||
|
|
||||||
|
$<$<C_COMPILER_ID:MSVC>:
|
||||||
|
/WX
|
||||||
|
>
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
# Link warnings configuration
|
||||||
|
target_link_options(SRB2SDL2 PRIVATE
|
||||||
|
$<$<C_COMPILER_ID:GNU>:
|
||||||
|
# -Wl,--as-needed - Was controlled by NOLDWARNING
|
||||||
|
>
|
||||||
|
)
|
||||||
|
|
||||||
if("${CMAKE_SYSTEM_NAME}" MATCHES Windows)
|
if("${CMAKE_SYSTEM_NAME}" MATCHES Windows)
|
||||||
target_sources(SRB2SDL2 PRIVATE
|
target_sources(SRB2SDL2 PRIVATE
|
||||||
../win32/win_dbg.c
|
../win32/win_dbg.c
|
||||||
|
|
@ -62,12 +216,6 @@ if("${CMAKE_SYSTEM_NAME}" MATCHES Windows)
|
||||||
target_link_libraries(SRB2SDL2 PRIVATE SDL2::SDL2main)
|
target_link_libraries(SRB2SDL2 PRIVATE SDL2::SDL2main)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(NOT "${SRB2_CONFIG_SYSTEM_LIBRARIES}" AND NOT "${SRB2_CONFIG_SHARED_INTERNAL_LIBRARIES}")
|
|
||||||
target_link_libraries(SRB2SDL2 PRIVATE SDL2::SDL2-static SDL2_mixer::SDL2_mixer-static)
|
|
||||||
else()
|
|
||||||
target_link_libraries(SRB2SDL2 PRIVATE SDL2::SDL2 SDL2_mixer::SDL2_mixer)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if("${CMAKE_SYSTEM_NAME}" MATCHES Linux)
|
if("${CMAKE_SYSTEM_NAME}" MATCHES Linux)
|
||||||
target_link_libraries(SRB2SDL2 PRIVATE m rt)
|
target_link_libraries(SRB2SDL2 PRIVATE m rt)
|
||||||
endif()
|
endif()
|
||||||
|
|
@ -81,8 +229,84 @@ if("${CMAKE_SYSTEM_NAME}" MATCHES Windows)
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
target_compile_definitions(SRB2SDL2 PRIVATE -DHAVE_MIXER -DSOUND=SOUND_MIXER)
|
find_package(SDL2 CONFIG REQUIRED)
|
||||||
|
find_package(SDL2 REQUIRED)
|
||||||
|
if(TARGET SDL2main)
|
||||||
|
target_link_libraries(SRB2SDL2 PRIVATE SDL2main)
|
||||||
|
endif()
|
||||||
target_compile_definitions(SRB2SDL2 PRIVATE -DDIRECTFULLSCREEN -DHAVE_SDL)
|
target_compile_definitions(SRB2SDL2 PRIVATE -DDIRECTFULLSCREEN -DHAVE_SDL)
|
||||||
|
target_include_directories(SRB2SDL2 PRIVATE ${SDL2_INCLUDE_DIR})
|
||||||
|
|
||||||
|
find_package(SDL2_mixer_ext CONFIG QUIET)
|
||||||
|
find_package(SDL2_mixer_ext QUIET)
|
||||||
|
if(TARGET SDL2_mixer_ext::SDL2_mixer_ext OR TARGET SDL2_mixer_ext::SDL2_mixer_ext_Static OR TARGET SDL2_mixer_ext OR TARGET SDL2_mixer_ext_Static)
|
||||||
|
if(NOT TARGET SDL2_mixer_ext::SDL2_mixer_ext_Static AND TARGET SDL2_mixer_ext_Static)
|
||||||
|
add_library(SDL2_mixer_ext::SDL2_mixer_ext_Static ALIAS SDL2_mixer_ext_Static)
|
||||||
|
endif()
|
||||||
|
if(NOT TARGET SDL2_mixer_ext::SDL2_mixer_ext AND TARGET SDL2_mixer_ext)
|
||||||
|
add_library(SDL2_mixer_ext::SDL2_mixer_ext ALIAS SDL2_mixer_ext)
|
||||||
|
endif()
|
||||||
|
if(TARGET SDL2_mixer_ext::SDL2_mixer_ext OR TARGET SDL2_mixer_ext::SDL2_mixer_ext_Static)
|
||||||
|
if(TARGET SDL2_mixer_ext::SDL2_mixer_ext_Static)
|
||||||
|
target_link_libraries(SRB2SDL2 PRIVATE SDL2_mixer_ext::SDL2_mixer_ext_Static)
|
||||||
|
else()
|
||||||
|
target_link_libraries(SRB2SDL2 PRIVATE SDL2_mixer_ext::SDL2_mixer_ext)
|
||||||
|
endif()
|
||||||
|
target_compile_definitions(SRB2SDL2 PRIVATE -DHAVE_MIXER -DHAVE_MIXERX -DSOUND=SOUND_MIXER)
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(TARGET SDL2_mixer_ext::SDL2_mixer_ext OR TARGET SDL2_mixer_ext::SDL2_mixer_ext_Static)
|
||||||
|
message(STATUS "SDL2_mixer_ext found, skipping SDL2_mixer")
|
||||||
|
else()
|
||||||
|
message(STATUS "SDL2_mixer_ext not found, going to try SDL2_mixer")
|
||||||
|
find_package(SDL2_mixer CONFIG QUIET)
|
||||||
|
find_package(SDL2_mixer QUIET)
|
||||||
|
if(TARGET SDL2_mixer::SDL2_mixer OR TARGET SDL2_mixer::SDL2_mixer-static OR TARGET SDL2_mixer OR TARGET SDL2_mixer_Static)
|
||||||
|
if(NOT TARGET SDL2_mixer::SDL2_mixer-static AND TARGET SDL2_mixer_Static)
|
||||||
|
add_library(SDL2_mixer::SDL2_mixer-static ALIAS SDL2_mixer_Static)
|
||||||
|
endif()
|
||||||
|
if(NOT TARGET SDL2_mixer::SDL2_mixer AND TARGET SDL2_mixer)
|
||||||
|
add_library(SDL2_mixer::SDL2_mixer ALIAS SDL2_mixer)
|
||||||
|
endif()
|
||||||
|
if(TARGET SDL2_mixer::SDL2_mixer OR TARGET SDL2_mixer::SDL2_mixer-static)
|
||||||
|
if(TARGET SDL2_mixer::SDL2_mixer-static)
|
||||||
|
target_link_libraries(SRB2SDL2 PRIVATE SDL2_mixer::SDL2_mixer-static)
|
||||||
|
else()
|
||||||
|
target_link_libraries(SRB2SDL2 PRIVATE SDL2_mixer::SDL2_mixer)
|
||||||
|
endif()
|
||||||
|
target_compile_definitions(SRB2SDL2 PRIVATE -DHAVE_MIXER -DSOUND=SOUND_MIXER)
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(TARGET SDL2_mixer_ext::SDL2_mixer_ext OR TARGET SDL2_mixer_ext::SDL2_mixer_ext_Static OR TARGET SDL2_mixer::SDL2_mixer OR TARGET SDL2_mixer::SDL2_mixer-static)
|
||||||
|
target_sources(SRB2SDL2 PRIVATE mixer_sound.c)
|
||||||
|
target_link_libraries(SRB2SDL2 PRIVATE SDL2::SDL2)
|
||||||
|
else()
|
||||||
|
target_sources(SRB2SDL2 PRIVATE sdl_sound.c)
|
||||||
|
target_link_libraries(SRB2SDL2 PRIVATE SDL2::SDL2)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(TARGET SDL2::SDL2)
|
||||||
|
message(STATUS "SDL2 Found")
|
||||||
|
else()
|
||||||
|
message(STATUS "no SDL2 Found")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(TARGET SDL2::SDL2main)
|
||||||
|
message(STATUS "SDL2main Found")
|
||||||
|
else()
|
||||||
|
message(STATUS "No SDL2main Found")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(TARGET SDL2_mixer_ext::SDL2_mixer_ext OR TARGET SDL2_mixer_ext::SDL2_mixer_ext_Static)
|
||||||
|
message(STATUS "SDL2_mixer_ext Found")
|
||||||
|
elseif(TARGET SDL2_mixer::SDL2_mixer OR TARGET SDL2_mixer::SDL2_mixer-static)
|
||||||
|
message(STATUS "SDL2_mixer found")
|
||||||
|
else()
|
||||||
|
message(STATUS "no SDL2_mixer_ext or SDL2_mixer Found")
|
||||||
|
endif()
|
||||||
|
|
||||||
#### Installation ####
|
#### Installation ####
|
||||||
if("${CMAKE_SYSTEM_NAME}" MATCHES Darwin)
|
if("${CMAKE_SYSTEM_NAME}" MATCHES Darwin)
|
||||||
|
|
|
||||||
|
|
@ -2305,7 +2305,7 @@ void I_SleepDuration(precise_t duration)
|
||||||
int status;
|
int status;
|
||||||
do status = clock_nanosleep(CLOCK_MONOTONIC, 0, &ts, &ts);
|
do status = clock_nanosleep(CLOCK_MONOTONIC, 0, &ts, &ts);
|
||||||
while (status == EINTR);
|
while (status == EINTR);
|
||||||
#else
|
#elif defined (MIN_SLEEP_DURATION_MS)
|
||||||
UINT64 precision = I_GetPrecisePrecision();
|
UINT64 precision = I_GetPrecisePrecision();
|
||||||
INT32 sleepvalue = cv_sleep.value;
|
INT32 sleepvalue = cv_sleep.value;
|
||||||
UINT64 delaygranularity;
|
UINT64 delaygranularity;
|
||||||
|
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
||||||
target_sources(srb2tests PRIVATE
|
|
||||||
boolcompat.cpp
|
|
||||||
)
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
#include <catch2/catch_test_macros.hpp>
|
|
||||||
|
|
||||||
#include "../doomtype.h"
|
|
||||||
|
|
||||||
TEST_CASE("C++ bool is convertible to doomtype.h boolean") {
|
|
||||||
REQUIRE(static_cast<boolean>(true) == 1);
|
|
||||||
REQUIRE(static_cast<boolean>(false) == 0);
|
|
||||||
}
|
|
||||||
26
thirdparty/00-SDL-Mixer-X-2.6.0-DISABLE_INSTALL.patch
vendored
Normal file
26
thirdparty/00-SDL-Mixer-X-2.6.0-DISABLE_INSTALL.patch
vendored
Normal file
|
|
@ -0,0 +1,26 @@
|
||||||
|
--- a/CMakeLists.txt 2023-11-22 22:42:53.000000000 -0500
|
||||||
|
+++ b/CMakeLists.txt 2024-02-15 18:46:57.852076200 -0500
|
||||||
|
@@ -45,6 +45,7 @@
|
||||||
|
|
||||||
|
option(SDL_MIXER_X_STATIC "Build static library of SDL Mixer X" ${SDL_MIXER_X_STATIC_ENABLED_BY_DEFAULT})
|
||||||
|
option(SDL_MIXER_X_SHARED "Build shared library of SDL Mixer X" ${SDL_MIXER_X_SHARED_ENABLED_BY_DEFAULT})
|
||||||
|
+ option(SDL_MIXER_X_DISABLE_INSTALL "Disable install of SDL Mixer X" OFF)
|
||||||
|
else()
|
||||||
|
set(SDL_MIXER_X_STATIC ON)
|
||||||
|
set(SDL_MIXER_X_SHARED OFF)
|
||||||
|
@@ -475,6 +476,7 @@
|
||||||
|
add_subdirectory(examples)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
+if(NOT SDL_MIXER_X_DISABLE_INSTALL)
|
||||||
|
if(SDL_MIXER_X_STATIC AND NOT BUILD_AS_VB6_BINDING)
|
||||||
|
install(TARGETS SDL2_mixer_ext_Static
|
||||||
|
EXPORT SDL2MixerExtStaticTargets
|
||||||
|
@@ -500,6 +502,7 @@
|
||||||
|
NAMESPACE SDL2_mixer_ext::
|
||||||
|
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/SDL2_mixer_ext")
|
||||||
|
endif()
|
||||||
|
+endif()
|
||||||
|
|
||||||
|
|
||||||
|
if(BUILD_AS_VB6_BINDING)
|
||||||
23
thirdparty/CMakeLists.txt
vendored
23
thirdparty/CMakeLists.txt
vendored
|
|
@ -1,23 +1,2 @@
|
||||||
macro(export)
|
|
||||||
endmacro()
|
|
||||||
|
|
||||||
if(SRB2_CONFIG_SHARED_INTERNAL_LIBRARIES)
|
include("Ccache.cmake")
|
||||||
set(SRB2_INTERNAL_LIBRARY_TYPE SHARED)
|
|
||||||
set(NOT_SRB2_CONFIG_SHARED_INTERNAL_LIBRARIES OFF)
|
|
||||||
else()
|
|
||||||
set(SRB2_INTERNAL_LIBRARY_TYPE STATIC)
|
|
||||||
set(NOT_SRB2_CONFIG_SHARED_INTERNAL_LIBRARIES ON)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(NOT "${SRB2_CONFIG_SYSTEM_LIBRARIES}")
|
|
||||||
include("cpm-sdl2.cmake")
|
|
||||||
include("cpm-sdl2-mixer.cmake")
|
|
||||||
include("cpm-zlib.cmake")
|
|
||||||
include("cpm-png.cmake")
|
|
||||||
include("cpm-curl.cmake")
|
|
||||||
include("cpm-openmpt.cmake")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if("${SRB2_CONFIG_USE_GME}")
|
|
||||||
include("cpm-libgme.cmake")
|
|
||||||
endif()
|
|
||||||
|
|
|
||||||
15
thirdparty/Ccache.cmake
vendored
Normal file
15
thirdparty/Ccache.cmake
vendored
Normal file
|
|
@ -0,0 +1,15 @@
|
||||||
|
# Enable CCache
|
||||||
|
# (Set USE_CCACHE=ON to use, CCACHE_OPTIONS for options)
|
||||||
|
if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL Windows)
|
||||||
|
option(USE_CCACHE "Enable ccache support" OFF)
|
||||||
|
|
||||||
|
if(USE_CCACHE)
|
||||||
|
find_program(CCACHE_TOOL_PATH ccache)
|
||||||
|
if(CCACHE_TOOL_PATH)
|
||||||
|
set(CMAKE_C_COMPILER_LAUNCHER ${CCACHE_TOOL_PATH} CACHE STRING "" FORCE)
|
||||||
|
set(CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE_TOOL_PATH} CACHE STRING "" FORCE)
|
||||||
|
else()
|
||||||
|
message(WARNING "USE_CCACHE was set but ccache is not found (set CCACHE_TOOL_PATH)")
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
16
thirdparty/cpm-libgme.cmake
vendored
16
thirdparty/cpm-libgme.cmake
vendored
|
|
@ -1,16 +0,0 @@
|
||||||
CPMAddPackage(
|
|
||||||
NAME libgme
|
|
||||||
VERSION 0.6.3
|
|
||||||
URL "https://bitbucket.org/mpyne/game-music-emu/get/e76bdc0cb916e79aa540290e6edd0c445879d3ba.zip"
|
|
||||||
EXCLUDE_FROM_ALL ON
|
|
||||||
OPTIONS
|
|
||||||
"BUILD_SHARED_LIBS ${SRB2_CONFIG_SHARED_INTERNAL_LIBRARIES}"
|
|
||||||
"ENABLE_UBSAN OFF"
|
|
||||||
"GME_YM2612_EMU MAME"
|
|
||||||
)
|
|
||||||
|
|
||||||
if(libgme_ADDED)
|
|
||||||
target_compile_features(gme PRIVATE cxx_std_11)
|
|
||||||
# libgme's CMakeLists.txt already links this
|
|
||||||
#target_link_libraries(gme PRIVATE ZLIB::ZLIB)
|
|
||||||
endif()
|
|
||||||
69
thirdparty/cpm-png.cmake
vendored
69
thirdparty/cpm-png.cmake
vendored
|
|
@ -1,69 +0,0 @@
|
||||||
CPMAddPackage(
|
|
||||||
NAME png
|
|
||||||
VERSION 1.6.38
|
|
||||||
URL "https://github.com/glennrp/libpng/archive/refs/tags/v1.6.38.zip"
|
|
||||||
# png cmake build is broken on msys/mingw32
|
|
||||||
DOWNLOAD_ONLY YES
|
|
||||||
)
|
|
||||||
|
|
||||||
if(png_ADDED)
|
|
||||||
# Since png's cmake build is broken, we're going to create a target manually
|
|
||||||
set(
|
|
||||||
PNG_SOURCES
|
|
||||||
png.h
|
|
||||||
pngconf.h
|
|
||||||
pngpriv.h
|
|
||||||
pngdebug.h
|
|
||||||
pnginfo.h
|
|
||||||
pngstruct.h
|
|
||||||
png.c
|
|
||||||
pngerror.c
|
|
||||||
pngget.c
|
|
||||||
pngmem.c
|
|
||||||
pngpread.c
|
|
||||||
pngread.c
|
|
||||||
pngrio.c
|
|
||||||
pngrtran.c
|
|
||||||
pngrutil.c
|
|
||||||
pngset.c
|
|
||||||
pngtrans.c
|
|
||||||
pngwio.c
|
|
||||||
pngwrite.c
|
|
||||||
pngwtran.c
|
|
||||||
pngwutil.c
|
|
||||||
)
|
|
||||||
list(TRANSFORM PNG_SOURCES PREPEND "${png_SOURCE_DIR}/")
|
|
||||||
|
|
||||||
add_custom_command(
|
|
||||||
OUTPUT "${png_BINARY_DIR}/include/png.h" "${png_BINARY_DIR}/include/pngconf.h"
|
|
||||||
COMMAND ${CMAKE_COMMAND} -E copy "${png_SOURCE_DIR}/png.h" "${png_SOURCE_DIR}/pngconf.h" "${png_BINARY_DIR}/include"
|
|
||||||
DEPENDS "${png_SOURCE_DIR}/png.h" "${png_SOURCE_DIR}/pngconf.h"
|
|
||||||
VERBATIM
|
|
||||||
)
|
|
||||||
add_custom_command(
|
|
||||||
OUTPUT "${png_BINARY_DIR}/include/pnglibconf.h"
|
|
||||||
COMMAND ${CMAKE_COMMAND} -E copy "${png_SOURCE_DIR}/scripts/pnglibconf.h.prebuilt" "${png_BINARY_DIR}/include/pnglibconf.h"
|
|
||||||
DEPENDS "${png_SOURCE_DIR}/scripts/pnglibconf.h.prebuilt"
|
|
||||||
VERBATIM
|
|
||||||
)
|
|
||||||
list(
|
|
||||||
APPEND PNG_SOURCES
|
|
||||||
"${png_BINARY_DIR}/include/png.h"
|
|
||||||
"${png_BINARY_DIR}/include/pngconf.h"
|
|
||||||
"${png_BINARY_DIR}/include/pnglibconf.h"
|
|
||||||
)
|
|
||||||
add_library(png "${SRB2_INTERNAL_LIBRARY_TYPE}" ${PNG_SOURCES})
|
|
||||||
|
|
||||||
# Disable ARM NEON since having it automatic breaks libpng external build on clang for some reason
|
|
||||||
target_compile_definitions(png PRIVATE -DPNG_ARM_NEON_OPT=0)
|
|
||||||
|
|
||||||
# The png includes need to be available to consumers
|
|
||||||
target_include_directories(png PUBLIC "${png_BINARY_DIR}/include")
|
|
||||||
|
|
||||||
# ... and these also need to be present only for png build
|
|
||||||
target_include_directories(png PRIVATE "${ZLIB_SOURCE_DIR}")
|
|
||||||
target_include_directories(png PRIVATE "${ZLIB_BINARY_DIR}")
|
|
||||||
target_include_directories(png PRIVATE "${png_BINARY_DIR}")
|
|
||||||
target_link_libraries(png PRIVATE ZLIB::ZLIB)
|
|
||||||
add_library(PNG::PNG ALIAS png)
|
|
||||||
endif()
|
|
||||||
22
thirdparty/cpm-sdl2-mixer.cmake
vendored
22
thirdparty/cpm-sdl2-mixer.cmake
vendored
|
|
@ -1,22 +0,0 @@
|
||||||
CPMAddPackage(
|
|
||||||
NAME SDL2_mixer
|
|
||||||
VERSION 2.6.2
|
|
||||||
URL "https://github.com/libsdl-org/SDL_mixer/archive/refs/tags/release-2.6.2.zip"
|
|
||||||
EXCLUDE_FROM_ALL ON
|
|
||||||
OPTIONS
|
|
||||||
"BUILD_SHARED_LIBS ${SRB2_CONFIG_SHARED_INTERNAL_LIBRARIES}"
|
|
||||||
"SDL2MIXER_INSTALL OFF"
|
|
||||||
"SDL2MIXER_DEPS_SHARED OFF"
|
|
||||||
"SDL2MIXER_SAMPLES OFF"
|
|
||||||
"SDL2MIXER_VENDORED ON"
|
|
||||||
"SDL2MIXER_FLAC ON"
|
|
||||||
"SDL2MIXER_FLAC_LIBFLAC OFF"
|
|
||||||
"SDL2MIXER_FLAC_DRFLAC ON"
|
|
||||||
"SDL2MIXER_MOD OFF"
|
|
||||||
"SDL2MIXER_MP3 ON"
|
|
||||||
"SDL2MIXER_MP3_DRMP3 ON"
|
|
||||||
"SDL2MIXER_MIDI ON"
|
|
||||||
"SDL2MIXER_OPUS OFF"
|
|
||||||
"SDL2MIXER_VORBIS STB"
|
|
||||||
"SDL2MIXER_WAVE ON"
|
|
||||||
)
|
|
||||||
28
thirdparty/cpm-sdl2.cmake
vendored
28
thirdparty/cpm-sdl2.cmake
vendored
|
|
@ -1,28 +0,0 @@
|
||||||
set(
|
|
||||||
internal_sdl2_options
|
|
||||||
|
|
||||||
"BUILD_SHARED_LIBS ${SRB2_CONFIG_SHARED_INTERNAL_LIBRARIES}"
|
|
||||||
"SDL_SHARED ${SRB2_CONFIG_SHARED_INTERNAL_LIBRARIES}"
|
|
||||||
"SDL_STATIC ${NOT_SRB2_CONFIG_SHARED_INTERNAL_LIBRARIES}"
|
|
||||||
"SDL_TEST OFF"
|
|
||||||
"SDL2_DISABLE_INSTALL ON"
|
|
||||||
)
|
|
||||||
|
|
||||||
if(${CMAKE_SYSTEM} MATCHES Windows)
|
|
||||||
list(APPEND internal_sdl2_options "SDL2_DISABLE_SDL2MAIN OFF")
|
|
||||||
endif()
|
|
||||||
if(${CMAKE_SYSTEM} MATCHES Darwin)
|
|
||||||
list(APPEND internal_sdl2_options "SDL2_DISABLE_SDL2MAIN OFF")
|
|
||||||
endif()
|
|
||||||
if(${CMAKE_SYSTEM} MATCHES Linux)
|
|
||||||
list(APPEND internal_sdl2_options "SDL2_DISABLE_SDL2MAIN ON")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
CPMAddPackage(
|
|
||||||
NAME SDL2
|
|
||||||
VERSION 2.28.5
|
|
||||||
GITHUB_REPOSITORY "libsdl-org/SDL"
|
|
||||||
GIT_TAG release-2.28.5
|
|
||||||
EXCLUDE_FROM_ALL ON
|
|
||||||
OPTIONS ${internal_sdl2_options}
|
|
||||||
)
|
|
||||||
18
thirdparty/cpm-zlib.cmake
vendored
18
thirdparty/cpm-zlib.cmake
vendored
|
|
@ -1,18 +0,0 @@
|
||||||
CPMAddPackage(
|
|
||||||
NAME zlib
|
|
||||||
VERSION 1.3.1
|
|
||||||
GITHUB_REPOSITORY "madler/zlib"
|
|
||||||
GIT_TAG v1.3.1
|
|
||||||
EXCLUDE_FROM_ALL
|
|
||||||
OPTIONS
|
|
||||||
"ZLIB_BUILD_EXAMPLES OFF"
|
|
||||||
)
|
|
||||||
|
|
||||||
if(zlib_ADDED)
|
|
||||||
if(SRB2_CONFIG_SHARED_INTERNAL_LIBRARIES)
|
|
||||||
add_library(ZLIB::ZLIB ALIAS zlib)
|
|
||||||
endif()
|
|
||||||
if(NOT_SRB2_CONFIG_SHARED_INTERNAL_LIBRARIES)
|
|
||||||
add_library(ZLIB::ZLIB ALIAS zlibstatic)
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
@ -1,8 +1,16 @@
|
||||||
|
if(TARGET CURL::libcurl)
|
||||||
|
return()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
message(STATUS "Third-party: creating target 'CURL::libcurl'")
|
||||||
|
|
||||||
|
set(CURL_ENABLE_EXPORT_TARGET OFF CACHE BOOL "" FORCE)
|
||||||
|
|
||||||
set(
|
set(
|
||||||
internal_curl_options
|
internal_curl_options
|
||||||
|
|
||||||
"BUILD_CURL_EXE OFF"
|
"BUILD_CURL_EXE OFF"
|
||||||
"BUILD_SHARED_LIBS ${SRB2_CONFIG_SHARED_INTERNAL_LIBRARIES}"
|
"BUILD_SHARED_LIBS OFF"
|
||||||
"CURL_DISABLE_TESTS ON"
|
"CURL_DISABLE_TESTS ON"
|
||||||
"HTTP_ONLY ON"
|
"HTTP_ONLY ON"
|
||||||
"CURL_DISABLE_CRYPTO_AUTH ON"
|
"CURL_DISABLE_CRYPTO_AUTH ON"
|
||||||
|
|
@ -26,10 +34,25 @@ if(${CMAKE_SYSTEM} MATCHES Linux)
|
||||||
list(APPEND internal_curl_options "CURL_USE_OPENSSL ON")
|
list(APPEND internal_curl_options "CURL_USE_OPENSSL ON")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
CPMAddPackage(
|
include(FetchContent)
|
||||||
NAME curl
|
|
||||||
VERSION 7.86.0
|
if (CURL_USE_THIRDPARTY)
|
||||||
URL "https://github.com/curl/curl/archive/refs/tags/curl-7_86_0.zip"
|
FetchContent_Declare(
|
||||||
EXCLUDE_FROM_ALL ON
|
curl
|
||||||
OPTIONS ${internal_curl_options}
|
VERSION 7.88.1
|
||||||
)
|
GITHUB_REPOSITORY "curl/curl"
|
||||||
|
GIT_TAG curl-7_88_1
|
||||||
|
EXCLUDE_FROM_ALL ON
|
||||||
|
OPTIONS ${internal_curl_options}
|
||||||
|
)
|
||||||
|
else()
|
||||||
|
FetchContent_Declare(
|
||||||
|
curl
|
||||||
|
SOURCE_DIR "${CMAKE_SOURCE_DIR}/thirdparty/curl/"
|
||||||
|
EXCLUDE_FROM_ALL ON
|
||||||
|
OPTIONS ${internal_curl_options}
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
FetchContent_MakeAvailable(curl)
|
||||||
|
|
||||||
38
thirdparty/libapng.cmake
vendored
Normal file
38
thirdparty/libapng.cmake
vendored
Normal file
|
|
@ -0,0 +1,38 @@
|
||||||
|
if(TARGET libapng_static)
|
||||||
|
return()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
message(STATUS "Third-party: creating target 'libapng_static'")
|
||||||
|
|
||||||
|
set(PNG_SHARED OFF CACHE BOOL "" FORCE)
|
||||||
|
set(PNG_BUILD_ZLIB ON CACHE BOOL "" FORCE)
|
||||||
|
|
||||||
|
include(FetchContent)
|
||||||
|
|
||||||
|
FetchContent_Declare(
|
||||||
|
libapng-local
|
||||||
|
SOURCE_DIR "${CMAKE_SOURCE_DIR}/thirdparty/libapng/"
|
||||||
|
EXCLUDE_FROM_ALL ON
|
||||||
|
DOWNLOAD_ONLY YES
|
||||||
|
OPTION
|
||||||
|
"PNG_SHARED OFF"
|
||||||
|
"PNG_EXECUTABLES OFF"
|
||||||
|
"PNG_TESTS OFF"
|
||||||
|
"PNG_BUILD_ZLIB ON"
|
||||||
|
)
|
||||||
|
|
||||||
|
FetchContent_MakeAvailable(libapng-local)
|
||||||
|
|
||||||
|
#add_custom_command(
|
||||||
|
#OUTPUT ${libapng-local_BINARY_DIR}/CMakeLists.txt
|
||||||
|
#COMMAND ${CMAKE_COMMAND}
|
||||||
|
# -Din_file:FILEPATH=${libapng-locall_SOURCE_DIR}/CMakeLists.txt
|
||||||
|
# -Dpatch_file:FILEPATH=${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/00-libapng-ZLIB.patch
|
||||||
|
# -Dout_file:FILEPATH=${libapng-local_BINARY_DIR}/CMakeLists.txt
|
||||||
|
# -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/PatchFile.cmake
|
||||||
|
#DEPENDS ${libapng-local_SOURCE_DIR}/CMakeLists.txt
|
||||||
|
#)
|
||||||
|
|
||||||
|
set(libapng_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/libapng" "${libapng_BINARY_DIR}" CACHE PATH "" FORCE)
|
||||||
|
|
||||||
|
set(libapng_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/libapng/png.h" "${CMAKE_CURRENT_SOURCE_DIR}/libapng/pngconf.h" CACHE PATH "" FORCE)
|
||||||
|
|
@ -1,13 +1,33 @@
|
||||||
CPMAddPackage(
|
if(TARGET libopenmpt)
|
||||||
NAME openmpt
|
#return()
|
||||||
VERSION 0.4.30
|
endif()
|
||||||
URL "https://github.com/OpenMPT/openmpt/archive/refs/tags/libopenmpt-0.4.30.zip"
|
|
||||||
DOWNLOAD_ONLY ON
|
|
||||||
)
|
|
||||||
|
|
||||||
if(openmpt_ADDED)
|
message(STATUS "Third-party: creating target 'libopenmpt'")
|
||||||
|
|
||||||
|
|
||||||
|
include(FetchContent)
|
||||||
|
|
||||||
|
if (libopenmpt_USE_THIRDPARTY)
|
||||||
|
FetchContent_Declare(
|
||||||
|
libopenmpt-local
|
||||||
|
GITHUB_REPOSITORY openmpt
|
||||||
|
GIT_TAG libopenmpt-0.4.38
|
||||||
|
version 0.4.38
|
||||||
|
EXCLUDE_FROM_ALL ON
|
||||||
|
)
|
||||||
|
else()
|
||||||
|
FetchContent_Declare(
|
||||||
|
libopenmpt-local
|
||||||
|
SOURCE_DIR "${CMAKE_SOURCE_DIR}/thirdparty/libopenmpt/"
|
||||||
|
EXCLUDE_FROM_ALL ON
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
FetchContent_MakeAvailable(libopenmpt)
|
||||||
|
|
||||||
|
if(aaaa-libopenmpt-local_ADDED)
|
||||||
set(
|
set(
|
||||||
openmpt_SOURCES
|
libopenmpt-local_SOURCES
|
||||||
|
|
||||||
# minimp3
|
# minimp3
|
||||||
# -DMPT_WITH_MINIMP3
|
# -DMPT_WITH_MINIMP3
|
||||||
|
|
@ -264,26 +284,26 @@ if(openmpt_ADDED)
|
||||||
libopenmpt/libopenmpt_impl.cpp
|
libopenmpt/libopenmpt_impl.cpp
|
||||||
libopenmpt/libopenmpt_ext_impl.cpp
|
libopenmpt/libopenmpt_ext_impl.cpp
|
||||||
)
|
)
|
||||||
list(TRANSFORM openmpt_SOURCES PREPEND "${openmpt_SOURCE_DIR}/")
|
list(TRANSFORM libopenmpt-local_SOURCES PREPEND "${libopenmpt-local_SOURCE_DIR}/")
|
||||||
|
|
||||||
# -DLIBOPENMPT_BUILD
|
# -DLIBOPENMPT_BUILD
|
||||||
configure_file("openmpt_svn_version.h" "svn_version.h")
|
configure_file("openmpt_svn_version.h" "svn_version.h")
|
||||||
add_library(openmpt "${SRB2_INTERNAL_LIBRARY_TYPE}" ${openmpt_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/svn_version.h)
|
add_library(libopenmpt STATIC ${libopenmpt-local_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/svn_version.h)
|
||||||
if("${CMAKE_C_COMPILER_ID}" STREQUAL GNU OR "${CMAKE_C_COMPILER_ID}" STREQUAL Clang OR "${CMAKE_C_COMPILER_ID}" STREQUAL AppleClang)
|
if("${CMAKE_C_COMPILER_ID}" STREQUAL GNU OR "${CMAKE_C_COMPILER_ID}" STREQUAL Clang OR "${CMAKE_C_COMPILER_ID}" STREQUAL AppleClang)
|
||||||
target_compile_options(openmpt PRIVATE "-g0")
|
target_compile_options(libopenmpt PRIVATE "-g0")
|
||||||
endif()
|
endif()
|
||||||
if("${CMAKE_SYSTEM_NAME}" STREQUAL Windows AND "${CMAKE_C_COMPILER_ID}" STREQUAL MSVC)
|
if("${CMAKE_SYSTEM_NAME}" STREQUAL Windows AND "${CMAKE_C_COMPILER_ID}" STREQUAL MSVC)
|
||||||
target_link_libraries(openmpt PRIVATE Rpcrt4)
|
target_link_libraries(libopenmpt PRIVATE Rpcrt4)
|
||||||
endif()
|
endif()
|
||||||
target_compile_features(openmpt PRIVATE cxx_std_11)
|
target_compile_features(libopenmpt PRIVATE cxx_std_11)
|
||||||
target_compile_definitions(openmpt PRIVATE -DLIBOPENMPT_BUILD)
|
target_compile_definitions(libopenmpt PRIVATE -DLIBOPENMPT_BUILD)
|
||||||
|
|
||||||
target_include_directories(openmpt PRIVATE "${openmpt_SOURCE_DIR}/common")
|
target_include_directories(libopenmpt PRIVATE "${libopenmpt-local_SOURCE_DIR}/common")
|
||||||
target_include_directories(openmpt PRIVATE "${openmpt_SOURCE_DIR}/src")
|
target_include_directories(libopenmpt PRIVATE "${libopenmpt-local_SOURCE_DIR}/src")
|
||||||
target_include_directories(openmpt PRIVATE "${openmpt_SOURCE_DIR}/include")
|
target_include_directories(libopenmpt PRIVATE "${libopenmpt-local_SOURCE_DIR}/include")
|
||||||
target_include_directories(openmpt PRIVATE "${openmpt_SOURCE_DIR}")
|
target_include_directories(libopenmpt PRIVATE "${libopenmpt-local_SOURCE_DIR}")
|
||||||
target_include_directories(openmpt PRIVATE "${CMAKE_CURRENT_BINARY_DIR}")
|
target_include_directories(libopenmpt PRIVATE "${CMAKE_CURRENT_BINARY_DIR}")
|
||||||
|
|
||||||
# I wish this wasn't necessary, but it is
|
# I wish this wasn't necessary, but it is
|
||||||
target_include_directories(openmpt PUBLIC "${openmpt_SOURCE_DIR}")
|
target_include_directories(libopenmpt PUBLIC "${libopenmpt-local_SOURCE_DIR}")
|
||||||
endif()
|
endif()
|
||||||
1728
thirdparty/libpng-1.6.40-apng.patch
vendored
Normal file
1728
thirdparty/libpng-1.6.40-apng.patch
vendored
Normal file
File diff suppressed because it is too large
Load diff
10
thirdparty/openmpt_svn_version.h
vendored
10
thirdparty/openmpt_svn_version.h
vendored
|
|
@ -1,10 +0,0 @@
|
||||||
|
|
||||||
#pragma once
|
|
||||||
#define OPENMPT_VERSION_SVNVERSION "17963"
|
|
||||||
#define OPENMPT_VERSION_REVISION 17963
|
|
||||||
#define OPENMPT_VERSION_DIRTY 0
|
|
||||||
#define OPENMPT_VERSION_MIXEDREVISIONS 0
|
|
||||||
#define OPENMPT_VERSION_URL "https://source.openmpt.org/svn/openmpt/tags/libopenmpt-0.4.32"
|
|
||||||
#define OPENMPT_VERSION_DATE "2022-09-25T14:19:05.052596Z"
|
|
||||||
#define OPENMPT_VERSION_IS_PACKAGE 1
|
|
||||||
|
|
||||||
39
thirdparty/sdl2-mixer-ext.cmake
vendored
Normal file
39
thirdparty/sdl2-mixer-ext.cmake
vendored
Normal file
|
|
@ -0,0 +1,39 @@
|
||||||
|
if(TARGET SDL2_mixer_ext_Static)
|
||||||
|
return()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
message(STATUS "Third-party: creating target 'SDL2_mixer_ext::SDL2_mixer_ext'")
|
||||||
|
|
||||||
|
set(SDL_MIXER_X_SHARED ${SRB2_CONFIG_SHARED_INTERNAL_LIBRARIES} CACHE BOOL "" FORCE)
|
||||||
|
set(SDL_MIXER_X_STATIC ${NOT_SRB2_CONFIG_SHARED_INTERNAL_LIBRARIES} CACHE BOOL "" FORCE)
|
||||||
|
set(SDL_MIXER_X_DISABLE_INSTALL ON CACHE BOOL "" FORCE)
|
||||||
|
set(USE_SYSTEM_SDL2 ON CACHE BOOL "" FORCE)
|
||||||
|
set(SDL2_INCLUDE_PATH ${SDL2_INCLUDE_DIR} CACHE PATH "" FORCE)
|
||||||
|
set(USE_XMP OFF CACHE PATH "" FORCE)
|
||||||
|
|
||||||
|
set(
|
||||||
|
internal_SDL2_mixer_ext_options
|
||||||
|
"SDL_MIXER_X_SHARED ${SRB2_CONFIG_SHARED_INTERNAL_LIBRARIES}"
|
||||||
|
"SDL_MIXER_X_STATIC ${NOT_SRB2_CONFIG_SHARED_INTERNAL_LIBRARIES}"
|
||||||
|
"SDL_MIXER_X_DISABLE_INSTALL ON"
|
||||||
|
"USE_SYSTEM_SDL2 ON"
|
||||||
|
"USE_XMP OFF"
|
||||||
|
)
|
||||||
|
|
||||||
|
if(${CMAKE_SYSTEM} MATCHES Windows)
|
||||||
|
#list(APPEND internal_SDL2_mixer_ext_options "DOWNLOAD_AUDIO_CODECS_DEPENDENCY ON")
|
||||||
|
#set(DOWNLOAD_AUDIO_CODECS_DEPENDENCY ON CACHE BOOL "" FORCE)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
include(FetchContent)
|
||||||
|
|
||||||
|
|
||||||
|
FetchContent_Declare(
|
||||||
|
SDL2_mixer_ext
|
||||||
|
OPTIONS ${internal_SDL2_mixer_ext_options}
|
||||||
|
GIT_TAG "2.6.0-1"
|
||||||
|
GIT_REPOSITORY "https://github.com/STJr/SDL-Mixer-X.git"
|
||||||
|
)
|
||||||
|
|
||||||
|
FetchContent_MakeAvailable(SDL2_mixer_ext)
|
||||||
|
|
||||||
61
thirdparty/sdl2.cmake
vendored
Normal file
61
thirdparty/sdl2.cmake
vendored
Normal file
|
|
@ -0,0 +1,61 @@
|
||||||
|
if(TARGET SDL2-static)
|
||||||
|
return()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
message(STATUS "Third-party: creating target 'SDL2::SDL2'")
|
||||||
|
|
||||||
|
set(SDL_STATIC ON CACHE BOOL "" FORCE)
|
||||||
|
set(SDL_SHARED OFF CACHE BOOL "" FORCE)
|
||||||
|
set(SDL_TEST OFF CACHE BOOL "" FORCE)
|
||||||
|
set(SDL2_DISABLE_INSTALL OFF CACHE BOOL "" FORCE)
|
||||||
|
|
||||||
|
set(
|
||||||
|
internal_sdl2_options
|
||||||
|
|
||||||
|
"SDL_STATIC ON"
|
||||||
|
"SDL_SHARED OFF"
|
||||||
|
"SDL_TEST OFF"
|
||||||
|
"SDL2_DISABLE_INSTALL OFF"
|
||||||
|
)
|
||||||
|
|
||||||
|
if(${CMAKE_SYSTEM} MATCHES Windows)
|
||||||
|
list(APPEND internal_sdl2_options "SDL2_DISABLE_SDL2MAIN OFF")
|
||||||
|
option(SDL2_DISABLE_SDL2MAIN "Disable building/installation of SDL2main" OFF)
|
||||||
|
set(SDL2_DISABLE_SDL2MAIN OFF CACHE BOOL "" FORCE)
|
||||||
|
endif()
|
||||||
|
if(${CMAKE_SYSTEM} MATCHES Darwin)
|
||||||
|
list(APPEND internal_sdl2_options "SDL2_DISABLE_SDL2MAIN OFF")
|
||||||
|
option(SDL2_DISABLE_SDL2MAIN "Disable building/installation of SDL2main" OFF)
|
||||||
|
set(SDL2_DISABLE_SDL2MAIN OFF CACHE BOOL "" FORCE)
|
||||||
|
endif()
|
||||||
|
if(${CMAKE_SYSTEM} MATCHES Linux)
|
||||||
|
list(APPEND internal_sdl2_options "SDL2_DISABLE_SDL2MAIN ON")
|
||||||
|
option(SDL2_DISABLE_SDL2MAIN "Disable building/installation of SDL2main" ON)
|
||||||
|
set(SDL2_DISABLE_SDL2MAIN ON CACHE BOOL "" FORCE)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
include(FetchContent)
|
||||||
|
|
||||||
|
if (SDL2_USE_THIRDPARTY)
|
||||||
|
FetchContent_Declare(
|
||||||
|
SDL2
|
||||||
|
VERSION 2.30.0
|
||||||
|
GITHUB_REPOSITORY "libsdl-org/SDL"
|
||||||
|
GIT_TAG release-2.30.0
|
||||||
|
OPTIONS ${internal_sdl2_options}
|
||||||
|
OVERRIDE_FIND_PACKAGE
|
||||||
|
)
|
||||||
|
else()
|
||||||
|
FetchContent_Declare(
|
||||||
|
SDL2
|
||||||
|
SOURCE_DIR "${CMAKE_SOURCE_DIR}/thirdparty/SDL2/"
|
||||||
|
OPTIONS ${internal_sdl2_options}
|
||||||
|
OVERRIDE_FIND_PACKAGE
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
FetchContent_MakeAvailable(SDL2)
|
||||||
|
|
||||||
|
set(SDL2_INCLUDE_DIR "${SDL2_BINARY_DIR}/include" CACHE PATH "" FORCE)
|
||||||
|
set(SDL2_LIBRARY "${SDL2_BINARY_DIR}/SDL2-staticd.lib" CACHE PATH "" FORCE)
|
||||||
|
set(SDL2_DIR ${SDL2_BINARY_DIR} CACHE PATH "" FORCE)
|
||||||
0
thirdparty/vcpkg-overlays/.placeholder
vendored
Normal file
0
thirdparty/vcpkg-overlays/.placeholder
vendored
Normal file
36
thirdparty/zlib.cmake
vendored
Normal file
36
thirdparty/zlib.cmake
vendored
Normal file
|
|
@ -0,0 +1,36 @@
|
||||||
|
if(TARGET ZLIB::ZLIB)
|
||||||
|
return()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
message(STATUS "Third-party: creating target 'ZLIB::ZLIB'")
|
||||||
|
|
||||||
|
set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
|
||||||
|
|
||||||
|
include(FetchContent)
|
||||||
|
|
||||||
|
if (zlib_USE_THIRDPARTY)
|
||||||
|
FetchContent_Declare(
|
||||||
|
ZLIB
|
||||||
|
GITHUB_REPOSITORY "madler/zlib"
|
||||||
|
GIT_TAG v1.3.1
|
||||||
|
OVERRIDE_FIND_PACKAGE
|
||||||
|
OPTIONS
|
||||||
|
"ZLIB_BUILD_EXAMPLES OFF"
|
||||||
|
)
|
||||||
|
else()
|
||||||
|
FetchContent_Declare(
|
||||||
|
ZLIB
|
||||||
|
SOURCE_DIR "${CMAKE_SOURCE_DIR}/thirdparty/zlib/"
|
||||||
|
OVERRIDE_FIND_PACKAGE
|
||||||
|
OPTIONS
|
||||||
|
"ZLIB_BUILD_EXAMPLES OFF"
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
FetchContent_MakeAvailable(ZLIB)
|
||||||
|
|
||||||
|
|
||||||
|
add_library(ZLIB::ZLIB ALIAS zlibstatic)
|
||||||
|
|
||||||
|
set(ZLIB_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/zlib" "${zlib_BINARY_DIR}" CACHE PATH "" FORCE)
|
||||||
|
|
||||||
6
vcpkg-configuration.json
Normal file
6
vcpkg-configuration.json
Normal file
|
|
@ -0,0 +1,6 @@
|
||||||
|
{
|
||||||
|
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg-configuration.schema.json",
|
||||||
|
"overlay-ports": [
|
||||||
|
"./thirdparty/vcpkg-overlays"
|
||||||
|
]
|
||||||
|
}
|
||||||
85
vcpkg.json
Normal file
85
vcpkg.json
Normal file
|
|
@ -0,0 +1,85 @@
|
||||||
|
{
|
||||||
|
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
|
||||||
|
"name": "srb2",
|
||||||
|
"version": "1.0.0",
|
||||||
|
"builtin-baseline": "c823fd3e57035b10d970a96da2796a2db55e5df5",
|
||||||
|
"dependencies": [
|
||||||
|
"curl",
|
||||||
|
{
|
||||||
|
"name": "libgme",
|
||||||
|
"platform": "!(windows & mingw) & !native"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "libopenmpt",
|
||||||
|
"platform": "!(windows & mingw)"
|
||||||
|
},
|
||||||
|
"libpng",
|
||||||
|
"miniupnpc",
|
||||||
|
"sdl2",
|
||||||
|
{
|
||||||
|
"name": "sdl2-mixer-ext",
|
||||||
|
"features": [
|
||||||
|
{
|
||||||
|
"name": "cmd",
|
||||||
|
"platform": "linux"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "libflac",
|
||||||
|
"platform": "!(windows & mingw & !static)"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "libgme",
|
||||||
|
"platform": "!(windows & mingw) & !native"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "libmodplug",
|
||||||
|
"platform": "!(windows & mingw)"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "libopnmidi",
|
||||||
|
"platform": "!(windows & mingw)"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "libvorbis",
|
||||||
|
"platform": "!(windows & mingw & !static)"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "libxmp",
|
||||||
|
"platform": "!(windows & mingw)"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "mpg123",
|
||||||
|
"platform": "!(windows & mingw)"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "nativemidi",
|
||||||
|
"platform": "!(windows & mingw)"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "opusfile",
|
||||||
|
"platform": "!(windows & mingw)"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "pxtone",
|
||||||
|
"platform": "!(windows & mingw)"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "timidity",
|
||||||
|
"platform": "!(windows & mingw)"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "wavpack",
|
||||||
|
"platform": "!(windows & mingw)"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"zlib"
|
||||||
|
],
|
||||||
|
"overrides": [
|
||||||
|
{
|
||||||
|
"name": "sdl2",
|
||||||
|
"version": "2.28.5",
|
||||||
|
"port-version": 1
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
Loading…
Reference in a new issue