diff options
| author | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2024-02-04 20:59:52 +0100 |
|---|---|---|
| committer | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2024-02-05 15:04:28 +0100 |
| commit | ffa8ea13fbf50ad59d9fc4cea71b9aec4aca8bac (patch) | |
| tree | cb9a383441d1f5842c6ab6333f62c6eaffd59482 /src | |
| parent | 81413b5e4cf24ece22c57abf09bf44816ec3bf3a (diff) | |
| download | mana-ffa8ea13fbf50ad59d9fc4cea71b9aec4aca8bac.tar.gz mana-ffa8ea13fbf50ad59d9fc4cea71b9aec4aca8bac.tar.bz2 mana-ffa8ea13fbf50ad59d9fc4cea71b9aec4aca8bac.tar.xz mana-ffa8ea13fbf50ad59d9fc4cea71b9aec4aca8bac.zip | |
Require PhysFS 3.0
It seems the implementation of PhysicsFS RWops shipped requires a
somewhat up-to-date PhysFS (beyond just a missing PHYSFS_DECL macro).
Also simplified CMake files somewhat, enabling new behavior for some
policies that were triggering warnings. And removed the no longer used
FindSDL_gfx.cmake module (SDL_gfx is found using pkg-config since
2c51c98625b225cecfb9628c30d62d4e30f7e3e1).
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 68cba816..750c83bc 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,13 +1,8 @@ include(FindPkgConfig) -pkg_check_modules(SDL2 REQUIRED sdl2>=2.0.1) -pkg_check_modules(SDL2IMAGE REQUIRED SDL2_image) -pkg_check_modules(SDL2MIXER REQUIRED SDL2_mixer) -pkg_check_modules(SDL2NET REQUIRED SDL2_net) -pkg_check_modules(SDL2TTF REQUIRED SDL2_ttf) -pkg_check_modules(SDL2GFX REQUIRED SDL2_gfx) +pkg_check_modules(SDL2 REQUIRED sdl2>=2.0.1 SDL2_image SDL2_mixer SDL2_net SDL2_ttf SDL2_gfx) +pkg_check_modules(PHYSFS REQUIRED physfs>=3.0.0) FIND_PACKAGE(CURL REQUIRED) FIND_PACKAGE(LibXml2 REQUIRED) -FIND_PACKAGE(PhysFS REQUIRED) FIND_PACKAGE(PNG REQUIRED) FIND_PACKAGE(Gettext REQUIRED) @@ -22,10 +17,6 @@ IF (CMAKE_COMPILER_IS_GNUCXX) ENDIF() ENDIF() -IF (POLICY CMP0015) - CMAKE_POLICY(SET CMP0015 OLD) -ENDIF() - IF (ENABLE_MANASERV) INCLUDE_DIRECTORIES("../libs/enet/include") LINK_DIRECTORIES("../libs/enet") @@ -77,11 +68,6 @@ ENDIF (WITH_OPENGL) INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${SDL2_INCLUDE_DIRS} - ${SDL2IMAGE_INCLUDE_DIRS} - ${SDL2MIXER_INCLUDE_DIRS} - ${SDL2NET_INCLUDE_DIRS} - ${SDL2TTF_INCLUDE_DIRS} - ${SDL2GFX_INCLUDE_DIRS} ${PNG_INCLUDE_DIR} ${PHYSFS_INCLUDE_DIR} ${CURL_INCLUDE_DIR} @@ -654,11 +640,6 @@ ENDIF(ENABLE_MANASERV) TARGET_LINK_LIBRARIES(mana ${INTERNAL_LIBRARIES} ${SDL2_LIBRARIES} - ${SDL2GFX_LIBRARIES} - ${SDL2IMAGE_LIBRARIES} - ${SDL2MIXER_LIBRARIES} - ${SDL2NET_LIBRARIES} - ${SDL2TTF_LIBRARIES} ${PNG_LIBRARIES} ${PHYSFS_LIBRARY} ${CURL_LIBRARIES} |