mirror
/
devilutionX
mirror of https://github.com/diasurgical/devilutionX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Overhaul dependency options 

Changes how dependency options are handled and moves them out of
`CMakeLists.txt`.

Major changes:

1. The static default now takes `TARGET_SUPPORTS_SHARED_LIBS` into account
2. The `DIST` setting no longer affects the static default.
3. The static option is now visible for system dependencies as well.
   (it was previously hidden by `cmake_dependent_option`).
4. The auto-detection mechanism for `libfmt` and `SDL_image` only
   applies if the setting has not been set.
5. SDL2 on Android is now also linked statically,
   resulting in a 1.1 MiB smaller APK.

When using non-system dependencies, the default should always be static,
as there are 2 main use cases for these:

1. Dependencies that we must currently vendor because our forks have
   significant changes that are not yet merged/released upstream.
2. Platforms that have no system packages, such as Android and iOS.

In both cases, static linking is the most appropriate default.
pull/3688/head
Gleb Mazovetskiy 4 years ago committed by Anders Jenbo
parent
be0b79f9f5
commit
75222ccef8
15 changed files with 387 additions and 306 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      3rdParty/PKWare/CMakeLists.txt
  2. 22
      3rdParty/SDL_image/CMakeLists.txt
  3. 4
      3rdParty/asio/CMakeLists.txt
  4. 153
      CMake/Dependencies.cmake
  5. 66
      CMake/Platforms.cmake
  6. 15
      CMake/VcPkgManifestFeatures.cmake
  7. 6
      CMake/android_defs.cmake
  8. 6
      CMake/ctr/asio_defs.cmake
  9. 2
      CMake/ctr/n3ds_defs.cmake
  10. 40
      CMake/dependency_options.cmake
  11. 6
      CMake/ios_defs.cmake
  12. 5
      CMake/platforms/switch/asio_defs.cmake
  13. 10
      CMake/switch/asio_defs.cmake
  14. 352
      CMakeLists.txt
  15. 2
      Source/encrypt.cpp

4
3rdParty/PKWare/CMakeLists.txt vendored
Unescape View File

@ -0,0 +1,4 @@
add_library(PKWare STATIC
explode.cpp
implode.cpp)
target_include_directories(PKWare PUBLIC .)

22
3rdParty/SDL_image/CMakeLists.txt vendored
Unescape View File

@ -1,16 +1,28 @@
option(DEVILUTIONX_SYSTEM_LIBPNG "Use system-provided libpng" ON) include(dependency_options)
cmake_dependent_option(DEVILUTIONX_STATIC_LIBPNG "Link static libpng" OFF
"DEVILUTIONX_SYSTEM_LIBPNG AND NOT DIST" ON)
if(DEVILUTIONX_SYSTEM_LIBPNG) if(NOT DEFINED DEVILUTIONX_SYSTEM_LIBPNG)
find_package(PNG QUIET) find_package(PNG QUIET)
if(PNG_FOUND) if(PNG_FOUND)
message("-- Found png ${PNG_VERSION_STRING}") message("-- Found png ${PNG_VERSION_STRING}")
else() else()
message("-- Suitable system png package not found, will use png from source") message("-- Suitable system png package not found, will use png from source")
set(DEVILUTIONX_SYSTEM_LIBPNG OFF)
endif()
elseif(DEVILUTIONX_SYSTEM_LIBPNG)
# In previous versions of DevilutionX, libpng could be built from
# source even if `DEVILUTIONX_SYSTEM_LIBPNG` was true.
# Detect the older CMake cache and update to the new behaviour.
#
# This is a temporary upgrade path that will be removed one week from commit date.
find_package(PNG QUIET)
if(NOT PNG_FOUND)
set(DEVILUTIONX_SYSTEM_LIBPNG OFF CACHE BOOL "" FORCE)
endif() endif()
endif() endif()
if(NOT PNG_FOUND) dependency_options("libpng" DEVILUTIONX_SYSTEM_LIBPNG ON DEVILUTIONX_STATIC_LIBPNG)
if(DEVILUTIONX_SYSTEM_LIBPNG)
find_package(PNG REQUIRED)
else()
add_subdirectory(../libpng libpng) add_subdirectory(../libpng libpng)
endif() endif()

4
3rdParty/asio/CMakeLists.txt vendored
Unescape View File

@ -9,3 +9,7 @@ FetchContent_MakeAvailableExcludeFromAll(asio)
add_library(asio INTERFACE) add_library(asio INTERFACE)
target_include_directories(asio INTERFACE ${asio_SOURCE_DIR}/asio/include) target_include_directories(asio INTERFACE ${asio_SOURCE_DIR}/asio/include)
if(NINTENDO_3DS OR NINTENDO_SWITCH)
include(asio_defs REQUIRED)
endif()

153
CMake/Dependencies.cmake
Unescape View File

@ -0,0 +1,153 @@
# Options that control whether to use system dependencies or build them from source,
# and whether to link them statically.
include(dependency_options)
if(USE_SDL1)
find_package(SDL REQUIRED)
include_directories(${SDL_INCLUDE_DIR})
else()
dependency_options("SDL2" DEVILUTIONX_SYSTEM_SDL2 ON DEVILUTIONX_STATIC_SDL2)
if(DEVILUTIONX_SYSTEM_SDL2)
find_package(SDL2 REQUIRED)
if(TARGET SDL2::SDL2)
set(SDL2_MAIN SDL2::SDL2main)
elseif(TARGET SDL2::SDL2-static)
# On some distros, such as vitasdk, only the SDL2::SDL2-static target is available.
# Alias to SDL2::SDL2 because some finder scripts may refer to SDL2::SDL2.
if(CMAKE_VERSION VERSION_LESS "3.18")
# Aliasing local targets is not supported on CMake < 3.18, so make it global.
set_target_properties(SDL2::SDL2-static PROPERTIES IMPORTED_GLOBAL TRUE)
endif()
add_library(SDL2::SDL2 ALIAS SDL2::SDL2-static)
set(SDL2_MAIN SDL2::SDL2main)
else()
# Assume an older Debian derivate that comes with an sdl2-config.cmake
# that only defines `SDL2_LIBRARIES` (as -lSDL2) and `SDL2_INCLUDE_DIRS`.
add_library(SDL2_lib INTERFACE)
target_link_libraries(SDL2_lib INTERFACE ${SDL2_LIBRARIES})
target_include_directories(SDL2_lib INTERFACE ${SDL2_INCLUDE_DIRS})
# Can't define an INTERFACE target with ::, so alias instead
add_library(SDL2::SDL2 ALIAS SDL2_lib)
endif()
else()
add_subdirectory(3rdParty/SDL2)
set(SDL2_MAIN SDL2::SDL2main)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/3rdParty/SDL2/CMake")
endif()
endif()
macro(_find_SDL_image QUIET_OR_REQUIRED)
if(USE_SDL1)
find_package(SDL_image ${QUIET_OR_REQUIRED})
else()
# vcpkg uses sdl2-image as the package name
find_package(sdl2-image QUIET)
set(SDL_image_FOUND ${sdl2-image_FOUND})
if(NOT SDL_image_FOUND)
# Fall back on PkgConfig via FindSDL2_image.cmake
find_package(SDL2_image ${QUIET_OR_REQUIRED})
set(SDL_image_FOUND ${SDL2_image_FOUND})
endif()
endif()
endmacro()
if(NOT DEFINED DEVILUTIONX_SYSTEM_SDL_IMAGE)
_find_SDL_image(QUIET)
if(SDL_image_FOUND)
message("-- Found SDL_image")
else()
message("-- Suitable system SDL_image package not found, will use SDL_image from source")
set(DEVILUTIONX_SYSTEM_SDL_IMAGE OFF)
endif()
elseif(DEVILUTIONX_SYSTEM_SDL_IMAGE)
# In previous versions of DevilutionX, SDL_image could be built from
# source even if `DEVILUTIONX_SYSTEM_SDL_IMAGE` was true.
# Detect the older CMake cache and update to the new behaviour.
#
# This is a temporary upgrade path that will be removed one week from commit date.
_find_SDL_image(QUIET)
if (NOT SDL_image_FOUND)
set(DEVILUTIONX_SYSTEM_SDL_IMAGE OFF CACHE BOOL "" FORCE)
endif()
endif()
dependency_options("SDL_image" DEVILUTIONX_SYSTEM_SDL_IMAGE ON DEVILUTIONX_STATIC_SDL_IMAGE)
if(DEVILUTIONX_SYSTEM_SDL_IMAGE)
_find_SDL_image(REQUIRED)
else()
add_subdirectory(3rdParty/SDL_image)
endif()
if(NOT NOSOUND)
dependency_options("SDL_audiolib" DEVILUTIONX_SYSTEM_SDL_AUDIOLIB OFF DEVILUTIONX_STATIC_SDL_AUDIOLIB)
if(DEVILUTIONX_SYSTEM_SDL_AUDIOLIB)
find_package(SDL_audiolib REQUIRED)
else()
add_subdirectory(3rdParty/SDL_audiolib)
endif()
endif()
if(PACKET_ENCRYPTION)
dependency_options("libsodium" DEVILUTIONX_SYSTEM_LIBSODIUM ON DEVILUTIONX_STATIC_LIBSODIUM)
if(DEVILUTIONX_SYSTEM_LIBSODIUM)
set(sodium_USE_STATIC_LIBS ${DEVILUTIONX_STATIC_LIBSODIUM})
find_package(sodium REQUIRED)
else()
add_subdirectory(3rdParty/libsodium)
endif()
endif()
if(NOT DEFINED DEVILUTIONX_SYSTEM_LIBFMT)
find_package(fmt 7.0.0 QUIET)
if(fmt_FOUND)
message("-- Found fmt ${fmt_VERSION}")
else()
message("-- Suitable system fmt package not found, will use fmt from source")
set(DEVILUTIONX_SYSTEM_LIBFMT OFF)
endif()
elseif(DEVILUTIONX_SYSTEM_LIBFMT)
# In previous versions of DevilutionX, libfmt could be built from
# source even if `DEVILUTIONX_SYSTEM_LIBFMT` was true.
# Detect the older CMake cache and update to the new behaviour.
#
# This is a temporary upgrade path that will be removed one week from commit date.
find_package(fmt 7.0.0 QUIET)
if (NOT fmt_FOUND)
set(DEVILUTIONX_SYSTEM_LIBFMT OFF CACHE BOOL "" FORCE)
endif()
endif()
dependency_options("libfmt" DEVILUTIONX_SYSTEM_LIBFMT ON DEVILUTIONX_STATIC_LIBFMT)
if(DEVILUTIONX_SYSTEM_LIBFMT)
find_package(fmt 7.0.0 REQUIRED)
else()
add_subdirectory(3rdParty/libfmt)
endif()
dependency_options("bzip2" DEVILUTIONX_SYSTEM_BZIP2 ON DEVILUTIONX_STATIC_BZIP2)
if(DEVILUTIONX_SYSTEM_BZIP2)
find_package(BZip2 REQUIRED)
else()
add_subdirectory(3rdParty/bzip2)
endif()
add_subdirectory(3rdParty/libsmackerdec)
if(WIN32)
add_subdirectory(3rdParty/find_steam_game)
endif()
add_subdirectory(3rdParty/simpleini)
add_subdirectory(3rdParty/libmpq)
add_subdirectory(3rdParty/hoehrmann_utf8)
add_subdirectory(3rdParty/PKWare)
if(NOT NONET AND NOT DISABLE_TCP)
add_subdirectory(3rdParty/asio)
endif()
if(NOT NONET AND NOT DISABLE_ZERO_TIER)
add_subdirectory(3rdParty/libzt)
endif()

66
CMake/Platforms.cmake
Unescape View File

@ -0,0 +1,66 @@
if(NINTENDO_SWITCH)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/switch")
include(switch_defs)
endif()
if(VITA)
# Work around a missing setting in the toolchain file.
# Fix sent upstream: https://github.com/vitasdk/vita-toolchain/pull/182
set(PKG_CONFIG_EXECUTABLE "$ENV{VITASDK}/bin/arm-vita-eabi-pkg-config")
include("$ENV{VITASDK}/share/vita.cmake" REQUIRED)
include(vita_defs)
endif()
set(TARGET_PLATFORM host CACHE STRING "Target platform")
set_property(CACHE TARGET_PLATFORM PROPERTY STRINGS host retrofw rg350 gkd350h cpigamesh)
if(TARGET_PLATFORM STREQUAL "lepus")
include(lepus_defs)
elseif(TARGET_PLATFORM STREQUAL "retrofw")
include(retrofw_defs)
elseif(TARGET_PLATFORM STREQUAL "rg350")
include(rg350_defs)
elseif(TARGET_PLATFORM STREQUAL "gkd350h")
include(gkd350h_defs)
elseif(TARGET_PLATFORM STREQUAL "cpigamesh")
include(cpigamesh_defs)
endif()
if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD|NetBSD|OpenBSD|DragonFly")
if(${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
add_definitions(-D_NETBSD_SOURCE)
else()
add_definitions(-D_BSD_SOURCE)
set(UBSAN OFF)
endif()
set(ASAN OFF)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DO_LARGEFILE=0 -Dstat64=stat -Dlstat64=lstat -Dlseek64=lseek -Doff64_t=off_t -Dfstat64=fstat -Dftruncate64=ftruncate")
endif()
if(WIN32)
set(ASAN OFF)
set(UBSAN OFF)
set(DIST ON)
endif()
if(HAIKU)
set(ASAN OFF)
set(UBSAN OFF)
endif()
if(AMIGA)
include(amiga_defs)
endif()
if(NINTENDO_3DS)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake/ctr")
include(n3ds_defs)
endif()
if(ANDROID)
include(android_defs)
endif()
if(IOS)
include(ios_defs)
endif()

15
CMake/VcPkgManifestFeatures.cmake
Unescape View File

@ -0,0 +1,15 @@
# See https://vcpkg.readthedocs.io/en/latest/users/manifests/
if(USE_SDL1)
list(APPEND VCPKG_MANIFEST_FEATURES "sdl1")
else()
list(APPEND VCPKG_MANIFEST_FEATURES "sdl2")
endif()
if(PACKET_ENCRYPTION)
list(APPEND VCPKG_MANIFEST_FEATURES "encryption")
endif()
if(USE_GETTEXT_FROM_VCPKG)
list(APPEND VCPKG_MANIFEST_FEATURES "translations")
endif()
if(RUN_TESTS)
list(APPEND VCPKG_MANIFEST_FEATURES "tests")
endif()

6
CMake/android_defs.cmake
Unescape View File

@ -4,6 +4,10 @@ set(VIRTUAL_GAMEPAD ON)
# Disable all system dependencies. # Disable all system dependencies.
# All of these will be fetched via FetchContent and linked statically. # All of these will be fetched via FetchContent and linked statically.
set(DEVILUTIONX_SYSTEM_SDL2 OFF) set(DEVILUTIONX_SYSTEM_SDL2 OFF)
# Static SDL2 on Android requires Position Independent Code.
set(SDL_STATIC_PIC ON)
set(DEVILUTIONX_SYSTEM_SDL_IMAGE OFF) set(DEVILUTIONX_SYSTEM_SDL_IMAGE OFF)
set(DEVILUTIONX_SYSTEM_SDL_AUDIOLIB OFF) set(DEVILUTIONX_SYSTEM_SDL_AUDIOLIB OFF)
set(DEVILUTIONX_SYSTEM_LIBSODIUM OFF) set(DEVILUTIONX_SYSTEM_LIBSODIUM OFF)
@ -13,7 +17,7 @@ set(DEVILUTIONX_SYSTEM_BZIP2 OFF)
# Package the assets with the APK. # Package the assets with the APK.
set(BUILD_ASSETS_MPQ OFF) set(BUILD_ASSETS_MPQ OFF)
set(DEVILUTIONX_ASSETS_OUTPUT_DIRECTORY "${DevilutionX_SOURCE_DIR}/android-project/app/src/main/assets") set(DEVILUTIONX_ASSETS_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/android-project/app/src/main/assets")
# Disable sanitizers. They're not supported out-of-the-box. # Disable sanitizers. They're not supported out-of-the-box.
set(ASAN OFF) set(ASAN OFF)

6
CMake/ctr/asio_defs.cmake
Unescape View File

@ -0,0 +1,6 @@
target_compile_definitions(asio INTERFACE
ASIO_DISABLE_THREADS=ON
ASIO_HAS_UNISTD_H=ON)
# Missing headers and declarations provided by DevilutionX
target_include_directories(asio BEFORE INTERFACE ${CMAKE_CURRENT_LIST_DIR}/asio/include)

2
CMake/ctr/n3ds_defs.cmake
Unescape View File

@ -11,7 +11,7 @@ set(USE_SDL1 ON)
set(PREFILL_PLAYER_NAME ON) set(PREFILL_PLAYER_NAME ON)
#3DS libraries #3DS libraries
list(APPEND CMAKE_MODULE_PATH "${DevilutionX_SOURCE_DIR}/CMake/ctr/modules") list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake/ctr/modules")
find_package(CITRO3D REQUIRED) find_package(CITRO3D REQUIRED)
#additional compilation definitions #additional compilation definitions

40
CMake/dependency_options.cmake
Unescape View File

@ -0,0 +1,40 @@
# This function defines 2 options for finding and linking a dependency:
#
# 1. ${SYSTEM_OPTION_NAME}: whether to use the system version of the dependency (default: ${DEFAULT_SYSTEM_VALUE})
# 2. ${STATIC_OPTION_NAME}: whether to link the dependency statically.
# The default is ON if ${SYSTEM_OPTION_NAME} is OFF or if target does not support shared libraries.
#
# The ${LIB_NAME} argument is a human-readable library name only used in option description strings.
function(dependency_options LIB_NAME SYSTEM_OPTION_NAME DEFAULT_SYSTEM_VALUE STATIC_OPTION_NAME)
option(${SYSTEM_OPTION_NAME} "Use system-provided ${LIB_NAME}" ${DEFAULT_SYSTEM_VALUE})
get_property(_supports_shared_libs GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS)
if(_supports_shared_libs)
if(${SYSTEM_OPTION_NAME})
set(_static_default OFF)
else()
set(_static_default ON)
# In previous versions of DevilutionX, the default could be OFF even for non-system libraries.
# Detect the older CMake cache and update to the new behaviour.
#
# This is a temporary upgrade path that will be removed one week from commit date.
set(${STATIC_OPTION_NAME} ON CACHE BOOL "" FORCE)
endif()
option(${STATIC_OPTION_NAME} "Link ${LIB_NAME} statically" ${_static_default})
else()
set(${STATIC_OPTION_NAME} ON)
set(${STATIC_OPTION_NAME} ON PARENT_SCOPE)
endif()
if(${STATIC_OPTION_NAME})
set(_msg_type "static")
else()
set(_msg_type "dynamic")
endif()
if(${SYSTEM_OPTION_NAME})
set(_msg_source "system library")
else()
set(_msg_source "library from source")
endif()
message("-- 📚 ${LIB_NAME}: ${_msg_type} ${_msg_source}")
endfunction()

6
CMake/ios_defs.cmake
Unescape View File

@ -4,17 +4,11 @@ set(VIRTUAL_GAMEPAD ON)
# Disable all system dependencies. # Disable all system dependencies.
# All of these will be fetched via FetchContent and linked statically. # All of these will be fetched via FetchContent and linked statically.
set(DEVILUTIONX_SYSTEM_SDL2 OFF) set(DEVILUTIONX_SYSTEM_SDL2 OFF)
set(DEVILUTIONX_STATIC_SDL2 ON)
set(DEVILUTIONX_SYSTEM_SDL_IMAGE OFF) set(DEVILUTIONX_SYSTEM_SDL_IMAGE OFF)
set(DEVILUTIONX_STATIC_SDL_IMAGE ON)
set(DEVILUTIONX_SYSTEM_SDL_AUDIOLIB OFF) set(DEVILUTIONX_SYSTEM_SDL_AUDIOLIB OFF)
set(DEVILUTIONX_STATIC_SDL_AUDIOLIB ON)
set(DEVILUTIONX_SYSTEM_LIBSODIUM OFF) set(DEVILUTIONX_SYSTEM_LIBSODIUM OFF)
set(DEVILUTIONX_STATIC_LIBSODIUM ON)
set(DEVILUTIONX_SYSTEM_LIBPNG OFF) set(DEVILUTIONX_SYSTEM_LIBPNG OFF)
set(DEVILUTIONX_STATIC_LIBPNG ON)
set(DEVILUTIONX_SYSTEM_LIBFMT OFF) set(DEVILUTIONX_SYSTEM_LIBFMT OFF)
set(DEVILUTIONX_STATIC_LIBFMT ON)
set(DISABLE_ZERO_TIER ON) set(DISABLE_ZERO_TIER ON)

5
CMake/platforms/switch/asio_defs.cmake
Unescape View File

@ -0,0 +1,5 @@
# Enables a number of header file definitions required by ASIO
target_compile_definitions(asio INTERFACE _DEFAULT_SOURCE=ON)
# Missing headers and declarations provided by DevilutionX
target_include_directories(asio BEFORE INTERFACE ${CMAKE_CURRENT_LIST_DIR}/asio/include)

10
CMake/switch/asio_defs.cmake
Unescape View File

@ -1,5 +1,5 @@
# Enables a number of header file definitions required by ASIO # Enables a number of header file definitions required by ASIO
target_compile_definitions(asio INTERFACE _DEFAULT_SOURCE=ON) target_compile_definitions(asio INTERFACE _DEFAULT_SOURCE=ON)
# Missing headers and declarations provided by DevilutionX # Missing headers and declarations provided by DevilutionX
target_include_directories(asio BEFORE INTERFACE CMake/switch/asio/include) target_include_directories(asio BEFORE INTERFACE ${CMAKE_CURRENT_LIST_DIR}/asio/include)

352
CMakeLists.txt
Unescape View File

@ -23,8 +23,10 @@ if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/dist")
endif() endif()
include(CMakeDependentOption) include(CMakeDependentOption)
include(CMake/out_of_tree.cmake)
include(CMake/genex.cmake) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake")
include(out_of_tree)
include(genex)
DEBUG_OPTION(ASAN "Enable address sanitizer") DEBUG_OPTION(ASAN "Enable address sanitizer")
DEBUG_OPTION(UBSAN "Enable undefined behaviour sanitizer") DEBUG_OPTION(UBSAN "Enable undefined behaviour sanitizer")
@ -53,6 +55,18 @@ mark_as_advanced(DISABLE_STREAMING_SOUNDS)
option(STREAM_ALL_AUDIO "Stream all the audio. For extremely RAM-constrained platforms.") option(STREAM_ALL_AUDIO "Stream all the audio. For extremely RAM-constrained platforms.")
mark_as_advanced(STREAM_ALL_AUDIO) mark_as_advanced(STREAM_ALL_AUDIO)
if(PIE)
set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
endif()
if(TSAN)
set(ASAN OFF)
endif()
if(USE_SDL1)
set(VIRTUAL_GAMEPAD OFF)
endif()
# By default, devilutionx.mpq is built only if smpq is installed. # By default, devilutionx.mpq is built only if smpq is installed.
if(NOT DEFINED BUILD_ASSETS_MPQ AND NOT SRC_DIST) if(NOT DEFINED BUILD_ASSETS_MPQ AND NOT SRC_DIST)
find_program(SMPQ smpq) find_program(SMPQ smpq)
@ -73,6 +87,43 @@ endif()
RELEASE_OPTION(CPACK "Configure CPack") RELEASE_OPTION(CPACK "Configure CPack")
# These must be included after the options above but before the `project` call.
include(VcPkgManifestFeatures)
# Set up the `project` early so that properties such as `TARGET_SUPPORTS_SHARED_LIBS` are defined.
if(NOT VERSION_NUM)
include(CMake/git.cmake)
get_git_tag(VERSION_NUM)
if (NOT "${VERSION_NUM}" STREQUAL "")
string(REGEX MATCH "([0-9]+\\.[0-9]+\\.[0-9]+)" VERSION_NUM ${VERSION_NUM} )
endif()
get_git_commit_hash(GIT_COMMIT_HASH)
if(NOT VERSION_SUFFIX)
set(VERSION_SUFFIX "$<$<NOT:$<CONFIG:Release>>:-${GIT_COMMIT_HASH}>")
endif()
endif()
if(VERSION_NUM MATCHES untagged)
project(DevilutionX LANGUAGES C CXX)
else()
project(DevilutionX
VERSION ${VERSION_NUM}
LANGUAGES C CXX)
endif()
# Platform definitions can override options and we want `cmake_dependent_option` to see the effects,
# so ideally we would include Platforms.cmake before definining the options.
#
# However, `Platforms` require `project` to have been called (to get access to toolchain defs),
# but `project` must be called after `VcPkgManifestFeatures`, and `VcPkgManifestFeatures` need
# to be after the options.
include(Platforms)
# Recalculate the dependent options after including the Platforms:
if(NONET)
set(DISABLE_TCP ON)
set(DISABLE_ZERO_TIER ON)
set(PACKET_ENCRYPTION OFF)
endif()
if(BINARY_RELEASE OR CMAKE_BUILD_TYPE STREQUAL "Release") if(BINARY_RELEASE OR CMAKE_BUILD_TYPE STREQUAL "Release")
set(BINARY_RELEASE ON) set(BINARY_RELEASE ON)
@ -88,77 +139,11 @@ if(NIGHTLY_BUILD OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
set(CPACK ON) set(CPACK ON)
endif() endif()
if(USE_SDL1)
list(APPEND VCPKG_MANIFEST_FEATURES "sdl1")
else()
list(APPEND VCPKG_MANIFEST_FEATURES "sdl2")
endif()
if(PACKET_ENCRYPTION)
list(APPEND VCPKG_MANIFEST_FEATURES "encryption")
endif()
if(USE_GETTEXT_FROM_VCPKG)
list(APPEND VCPKG_MANIFEST_FEATURES "translations")
endif()
if(RUN_TESTS)
list(APPEND VCPKG_MANIFEST_FEATURES "tests")
endif()
if(NOT NOSOUND)
option(DEVILUTIONX_SYSTEM_SDL_AUDIOLIB "Use system-provided SDL_audiolib" OFF)
cmake_dependent_option(DEVILUTIONX_STATIC_SDL_AUDIOLIB "Link static SDL_audiolib" OFF
"DEVILUTIONX_SYSTEM_SDL_AUDIOLIB AND NOT DIST" ON)
endif()
if(PACKET_ENCRYPTION)
option(DEVILUTIONX_SYSTEM_LIBSODIUM "Use system-provided libsodium" ON)
cmake_dependent_option(DEVILUTIONX_STATIC_LIBSODIUM "Link static libsodium" OFF
"DEVILUTIONX_SYSTEM_LIBSODIUM AND NOT DIST" ON)
endif()
option(DEVILUTIONX_SYSTEM_LIBFMT "Use system-provided libfmt" ON)
cmake_dependent_option(DEVILUTIONX_STATIC_LIBFMT "Link static libfmt" OFF
"DEVILUTIONX_SYSTEM_LIBFMT AND NOT DIST" ON)
if (NOT USE_SDL1)
option(DEVILUTIONX_SYSTEM_SDL2 "Use system-provided SDL2" ON)
cmake_dependent_option(DEVILUTIONX_STATIC_SDL2 "Link static SDL2" OFF
"DEVILUTIONX_SYSTEM_SDL2 AND NOT DIST" ON)
endif()
option(DEVILUTIONX_SYSTEM_SDL_IMAGE "Use system-provided SDL_image" ON)
cmake_dependent_option(DEVILUTIONX_STATIC_SDL_IMAGE "Link static SDL_image" OFF
"DEVILUTIONX_SYSTEM_SDL_IMAGE AND NOT DIST" ON)
option(DEVILUTIONX_SYSTEM_BZIP2 "Use system-provided bzip2" ON)
cmake_dependent_option(DEVILUTIONX_STATIC_BZIP2 "Link static bzip2" OFF
"DEVILUTIONX_SYSTEM_BZIP2 AND NOT DIST" ON)
if(NOT VERSION_NUM)
include(CMake/git.cmake)
get_git_tag(VERSION_NUM)
if (NOT "${VERSION_NUM}" STREQUAL "")
string(REGEX MATCH "([0-9]+\\.[0-9]+\\.[0-9]+)" VERSION_NUM ${VERSION_NUM} )
endif()
get_git_commit_hash(GIT_COMMIT_HASH)
if(NOT VERSION_SUFFIX)
set(VERSION_SUFFIX "$<$<NOT:$<CONFIG:Release>>:-${GIT_COMMIT_HASH}>")
endif()
endif()
find_program(CCACHE_PROGRAM ccache) find_program(CCACHE_PROGRAM ccache)
if(CCACHE_PROGRAM) if(CCACHE_PROGRAM)
set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}") set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
endif() endif()
if(VERSION_NUM MATCHES untagged)
project(DevilutionX
LANGUAGES C CXX)
else()
project(DevilutionX
VERSION ${VERSION_NUM}
LANGUAGES C CXX)
endif()
# Not a genexp because CMake doesn't support it # Not a genexp because CMake doesn't support it
# https://gitlab.kitware.com/cmake/cmake/-/issues/20546 # https://gitlab.kitware.com/cmake/cmake/-/issues/20546
if(NOT DISABLE_LTO) if(NOT DISABLE_LTO)
@ -172,12 +157,6 @@ if(NOT DISABLE_LTO)
endif() endif()
endif() endif()
if(TSAN)
set(ASAN OFF)
endif()
list(APPEND CMAKE_MODULE_PATH "${DevilutionX_SOURCE_DIR}/CMake")
if(GPERF) if(GPERF)
if(GPERF_HEAP_FIRST_GAME_ITERATION) if(GPERF_HEAP_FIRST_GAME_ITERATION)
set(GPERF_HEAP_MAIN ON) set(GPERF_HEAP_MAIN ON)
@ -193,218 +172,18 @@ if(GPERF)
endif() endif()
endif() endif()
if(NINTENDO_SWITCH)
list(APPEND CMAKE_MODULE_PATH "${DevilutionX_SOURCE_DIR}/CMake/switch")
include(switch_defs)
endif()
if(VITA)
# Work around a missing setting in the toolchain file.
# Fix sent upstream: https://github.com/vitasdk/vita-toolchain/pull/182
set(PKG_CONFIG_EXECUTABLE "$ENV{VITASDK}/bin/arm-vita-eabi-pkg-config")
include("$ENV{VITASDK}/share/vita.cmake" REQUIRED)
include(vita_defs)
endif()
set(TARGET_PLATFORM host CACHE STRING "Target platform")
set_property(CACHE TARGET_PLATFORM PROPERTY STRINGS host retrofw rg350 gkd350h cpigamesh)
if(TARGET_PLATFORM STREQUAL "lepus")
include(lepus_defs)
elseif(TARGET_PLATFORM STREQUAL "retrofw")
include(retrofw_defs)
elseif(TARGET_PLATFORM STREQUAL "rg350")
include(rg350_defs)
elseif(TARGET_PLATFORM STREQUAL "gkd350h")
include(gkd350h_defs)
elseif(TARGET_PLATFORM STREQUAL "cpigamesh")
include(cpigamesh_defs)
endif()
if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD|NetBSD|OpenBSD|DragonFly")
if(${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
add_definitions(-D_NETBSD_SOURCE)
else()
add_definitions(-D_BSD_SOURCE)
set(UBSAN OFF)
endif()
set(ASAN OFF)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DO_LARGEFILE=0 -Dstat64=stat -Dlstat64=lstat -Dlseek64=lseek -Doff64_t=off_t -Dfstat64=fstat -Dftruncate64=ftruncate")
endif()
if(WIN32)
set(ASAN OFF)
set(UBSAN OFF)
set(DIST ON)
endif()
if(HAIKU)
set(ASAN OFF)
set(UBSAN OFF)
endif()
if(AMIGA)
include(amiga_defs)
endif()
if(NINTENDO_3DS)
list(APPEND CMAKE_MODULE_PATH "${DevilutionX_SOURCE_DIR}/CMake/ctr")
include(n3ds_defs)
endif()
if(ANDROID)
include(android_defs)
endif()
if(IOS)
include(ios_defs)
endif()
if(PIE)
set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
endif()
if(USE_SDL1)
set(VIRTUAL_GAMEPAD OFF)
endif()
if(NONET)
# Fix dependent options if platform defs disable network
set(DISABLE_TCP ON)
set(DISABLE_ZERO_TIER ON)
set(PACKET_ENCRYPTION OFF)
endif()
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON) # for clang-tidy set(CMAKE_EXPORT_COMPILE_COMMANDS ON) # for clang-tidy
set(CMAKE_THREAD_PREFER_PTHREAD ON) set(CMAKE_THREAD_PREFER_PTHREAD ON)
set(THREADS_PREFER_PTHREAD_FLAG ON) set(THREADS_PREFER_PTHREAD_FLAG ON)
if(NOT NINTENDO_3DS) if(NOT NINTENDO_3DS)
find_package(Threads REQUIRED) find_package(Threads REQUIRED)
endif() endif()
if(PACKET_ENCRYPTION) # Dependencies must be included after Platforms.
if(DEVILUTIONX_SYSTEM_LIBSODIUM) include(Dependencies)
set(sodium_USE_STATIC_LIBS ${DEVILUTIONX_STATIC_LIBSODIUM})
find_package(sodium REQUIRED)
else()
add_subdirectory(3rdParty/libsodium)
endif()
endif()
if(DEVILUTIONX_SYSTEM_LIBFMT)
find_package(fmt 7.0.0 QUIET)
if(fmt_FOUND)
message("-- Found fmt ${fmt_VERSION}")
else()
message("-- Suitable system fmt package not found, will use fmt from source")
endif()
endif()
if(NOT fmt_FOUND)
add_subdirectory(3rdParty/libfmt)
endif()
if(NOT DEVILUTIONX_SYSTEM_BZIP2)
add_subdirectory(3rdParty/bzip2)
endif()
if(USE_SDL1)
find_package(SDL REQUIRED)
include_directories(${SDL_INCLUDE_DIR})
else()
if(DEVILUTIONX_SYSTEM_SDL2)
find_package(SDL2 REQUIRED)
if(TARGET SDL2::SDL2)
set(SDL2_MAIN SDL2::SDL2main)
elseif(TARGET SDL2::SDL2-static)
# On some distros, such as vitasdk, only the SDL2::SDL2-static target is available.
# Alias to SDL2::SDL2 because some finder scripts may refer to SDL2::SDL2.
if(CMAKE_VERSION VERSION_LESS "3.18")
# Aliasing local targets is not supported on CMake < 3.18, so make it global.
set_target_properties(SDL2::SDL2-static PROPERTIES IMPORTED_GLOBAL TRUE)
endif()
add_library(SDL2::SDL2 ALIAS SDL2::SDL2-static)
set(SDL2_MAIN SDL2::SDL2main)
else()
# Assume an older Debian derivate that comes with an sdl2-config.cmake
# that only defines `SDL2_LIBRARIES` (as -lSDL2) and `SDL2_INCLUDE_DIRS`.
add_library(SDL2_lib INTERFACE)
target_link_libraries(SDL2_lib INTERFACE ${SDL2_LIBRARIES})
target_include_directories(SDL2_lib INTERFACE ${SDL2_INCLUDE_DIRS})
# Can't define an INTERFACE target with ::, so alias instead
add_library(SDL2::SDL2 ALIAS SDL2_lib)
endif()
else()
add_subdirectory(3rdParty/SDL2)
set(SDL2_MAIN SDL2::SDL2main)
list(APPEND CMAKE_MODULE_PATH "${DevilutionX_SOURCE_DIR}/3rdParty/SDL2/CMake")
endif()
endif()
if(NOT NONET AND NOT DISABLE_TCP)
add_subdirectory(3rdParty/asio)
if(NINTENDO_3DS)
target_compile_definitions(asio INTERFACE
ASIO_DISABLE_THREADS=ON
ASIO_HAS_UNISTD_H=ON)
target_include_directories(asio BEFORE INTERFACE CMake/ctr/asio/include)
elseif(NINTENDO_SWITCH)
include(asio_defs)
endif()
endif()
if(DEVILUTIONX_SYSTEM_SDL_IMAGE)
if(USE_SDL1)
find_package(SDL_image QUIET)
else()
# vcpkg uses sdl2-image as the package name
find_package(sdl2-image QUIET)
set(SDL_image_FOUND ${sdl2-image_FOUND})
if(NOT SDL_image_FOUND)
# Fall back on PkgConfig via FindSDL2_image.cmake
find_package(SDL2_image QUIET)
set(SDL_image_FOUND ${SDL2_image_FOUND})
endif()
endif()
if(SDL_image_FOUND)
message("-- Found SDL_image")
else()
message("-- Suitable system SDL_image package not found, will use SDL_image from source")
endif()
endif()
if(NOT SDL_image_FOUND)
add_subdirectory(3rdParty/SDL_image)
endif()
if(NOT NOSOUND)
if(DEVILUTIONX_SYSTEM_SDL_AUDIOLIB)
find_package(SDL_audiolib REQUIRED)
else()
add_subdirectory(3rdParty/SDL_audiolib)
endif()
endif()
add_subdirectory(3rdParty/libsmackerdec)
if(WIN32)
add_subdirectory(3rdParty/find_steam_game)
endif()
add_subdirectory(3rdParty/simpleini)
add_subdirectory(3rdParty/libmpq)
add_subdirectory(3rdParty/hoehrmann_utf8)
add_library(PKWare STATIC
3rdParty/PKWare/explode.cpp
3rdParty/PKWare/implode.cpp)
target_include_directories(PKWare PUBLIC 3rdParty/PKWare)
set(libdevilutionx_SRCS set(libdevilutionx_SRCS
Source/appfat.cpp Source/appfat.cpp
@ -665,7 +444,7 @@ if(RUN_TESTS)
endif() endif()
add_library(libdevilutionx OBJECT ${libdevilutionx_SRCS}) add_library(libdevilutionx OBJECT ${libdevilutionx_SRCS})
if (ANDROID) if(ANDROID)
add_library(${BIN_TARGET} SHARED Source/main.cpp) add_library(${BIN_TARGET} SHARED Source/main.cpp)
else() else()
add_executable(${BIN_TARGET} add_executable(${BIN_TARGET}
@ -739,7 +518,7 @@ find_package(Gettext)
if (Gettext_FOUND) if (Gettext_FOUND)
file(MAKE_DIRECTORY "${DEVILUTIONX_ASSETS_OUTPUT_DIRECTORY}") file(MAKE_DIRECTORY "${DEVILUTIONX_ASSETS_OUTPUT_DIRECTORY}")
foreach(lang ${devilutionx_langs}) foreach(lang ${devilutionx_langs})
set(_po_file "${DevilutionX_SOURCE_DIR}/Translations/${lang}.po") set(_po_file "${CMAKE_CURRENT_SOURCE_DIR}/Translations/${lang}.po")
set(_gmo_file "${DEVILUTIONX_ASSETS_OUTPUT_DIRECTORY}/${lang}.gmo") set(_gmo_file "${DEVILUTIONX_ASSETS_OUTPUT_DIRECTORY}/${lang}.gmo")
set(_lang_target devilutionx_lang_${lang}) set(_lang_target devilutionx_lang_${lang})
add_custom_command( add_custom_command(
@ -1087,6 +866,14 @@ if(NOT NOSOUND)
target_link_libraries(libdevilutionx PUBLIC SDL_audiolib) target_link_libraries(libdevilutionx PUBLIC SDL_audiolib)
endif() endif()
if(NOT NONET AND NOT DISABLE_ZERO_TIER)
if(NOT ANDROID)
target_link_libraries(libdevilutionx PUBLIC zt-static)
else()
target_link_libraries(libdevilutionx PUBLIC zt-shared)
endif()
endif()
if(AMIGA) if(AMIGA)
target_link_libraries(libdevilutionx PUBLIC target_link_libraries(libdevilutionx PUBLIC
${ZLIB_LIBRARY}) ${ZLIB_LIBRARY})
@ -1391,12 +1178,3 @@ if(CPACK AND (APPLE OR BUILD_ASSETS_MPQ OR SRC_DIST))
set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH}) set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH})
include(CPack) include(CPack)
endif() endif()
if(NOT NONET AND NOT DISABLE_ZERO_TIER)
add_subdirectory(3rdParty/libzt)
if(NOT ANDROID)
target_link_libraries(libdevilutionx PUBLIC zt-static)
else()
target_link_libraries(libdevilutionx PUBLIC zt-shared)
endif()
endif()

2
Source/encrypt.cpp
Unescape View File

@ -9,9 +9,9 @@
#include <memory> #include <memory>
#include <SDL.h> #include <SDL.h>
#include <pkware.h>
#include "encrypt.h" #include "encrypt.h"
#include "pkware.h"
namespace devilution { namespace devilution {

Write Preview
Loading…
Cancel
Save