diff options
| author | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2025-05-20 10:32:12 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2025-05-21 13:47:04 +0200 |
| commit | 6154a8f70daa6c21b70e07b192e5eee73d667239 (patch) | |
| tree | 86fc44ed332e6e57a396e7c0831d5aa7e19e9712 | |
| parent | 383c318846abb6e37f2efbd718f7770f77e46d61 (diff) | |
| download | mana-6154a8f70daa6c21b70e07b192e5eee73d667239.tar.gz mana-6154a8f70daa6c21b70e07b192e5eee73d667239.tar.bz2 mana-6154a8f70daa6c21b70e07b192e5eee73d667239.tar.xz mana-6154a8f70daa6c21b70e07b192e5eee73d667239.zip | |
macOS: Use system Guichan by default
Guichan 0.8.3 was released and can now be installed through Homebrew,
we don't need to rely on the Guichan submodule on macOS anymore.
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 64221f96..115c2914 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,9 +54,7 @@ if(ENABLE_MANASERV AND NOT USE_SYSTEM_ENET) add_subdirectory(libs/enet EXCLUDE_FROM_ALL) endif() -# On macOS we need to build Guichan ourselves since it is disabled in Homebrew -# This might also be a good idea for the Windows build -if(APPLE OR NOT USE_SYSTEM_GUICHAN) +if(NOT USE_SYSTEM_GUICHAN) # This policy makes sure that the below options are not ignored by the added # Guichan CMakeLists.txt set(CMAKE_POLICY_DEFAULT_CMP0077 NEW) @@ -128,7 +128,7 @@ Installing the dependencies on Ubuntu: Installing the dependencies on macOS (with Homebrew): brew install sdl2 sdl2_image sdl2_mixer sdl2_net sdl2_ttf \ - physfs curl + physfs curl guichan Installing the dependencies on Fedora: diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 23505dcd..4a6a93db 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -48,7 +48,7 @@ if(ENABLE_MANASERV) message(STATUS "Manaserv support enabled") endif() -if(APPLE OR NOT USE_SYSTEM_GUICHAN) +if(NOT USE_SYSTEM_GUICHAN) message(STATUS "Using Guichan submodule") set(GUICHAN_INCLUDE_DIR "../libs/guichan/include") set(GUICHAN_LIBRARIES guichan) |