From 996508e1335b9db0560a024cad64641a18780db3 Mon Sep 17 00:00:00 2001 From: Vladimir Kravets Date: Wed, 21 Jun 2023 21:42:40 +0300 Subject: [PATCH 1/2] Fix macos Ventura build fix --- CMakeLists.txt | 3 ++- README-OSX.md | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c9ac89ad4b..0be9100b18 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -106,10 +106,11 @@ elseif(UNIX OR MINGW OR CYGWIN) pkg_check_modules(PKG_SDLGFX REQUIRED SDL_gfx) pkg_check_modules(PKG_SDLMIXER REQUIRED SDL_mixer) pkg_check_modules(PKG_YAMLCPP REQUIRED yaml-cpp) + pkg_check_modules(PKG_WEBP REQUIRED libwebp) include_directories(${PKG_SDL_INCLUDE_DIRS} ${PKG_ZLIB_INCLUDE_DIRS} ${PKG_SDLIMAGE_INCLUDE_DIRS}) include_directories(${PKG_SDLGFX_INCLUDE_DIRS} ${PKG_SDLMIXER_INCLUDE_DIRS} ${PKG_YAMLCPP_INCLUDE_DIRS}) - set(PKG_DEPS_LDFLAGS ${PKG_SDL_LDFLAGS} ${PKG_ZLIB_LDFLAGS} ${PKG_SDLIMAGE_LDFLAGS} ${PKG_SDLGFX_LDFLAGS} ${PKG_SDLMIXER_LDFLAGS} ${PKG_YAMLCPP_LDFLAGS} ${OPENGL_LIBRARIES}) + set(PKG_DEPS_LDFLAGS ${PKG_SDL_LDFLAGS} ${PKG_ZLIB_LDFLAGS} ${PKG_SDLIMAGE_LDFLAGS} ${PKG_SDLGFX_LDFLAGS} ${PKG_SDLMIXER_LDFLAGS} ${PKG_YAMLCPP_LDFLAGS} ${PKG_WEBP_LDFLAGS} ${OPENGL_LIBRARIES}) if (UNIX) set(PKG_DEPS_LDFLAGS "${PKG_DEPS_LDFLAGS};dl") diff --git a/README-OSX.md b/README-OSX.md index 03cfde0818..daadc66b4d 100644 --- a/README-OSX.md +++ b/README-OSX.md @@ -13,7 +13,7 @@ The dependencies you require are following: We recommend using [Homebrew](https://brew.sh) to facilitate this. With a working brew utility installed, run the following: ``` -$ brew install cmake yaml-cpp --with-static-lib sdl sdl_gfx sdl_image sdl_mixer --with-flac --with-libmikmod --with-libvorbis --with-static-lib +$ brew install cmake yaml-cpp sdl12-compact sdl_gfx sdl_image sdl_mixer webp ``` This should install all of these necessary dependencies to their appropriate place under /usr/local. From 9bfbf446b93c2a2cff2f7f50f433b39a4a1db78e Mon Sep 17 00:00:00 2001 From: Vladimir Kravets Date: Fri, 17 Nov 2023 18:35:18 +0200 Subject: [PATCH 2/2] Update README-OSX.md Fix sdl12 package name --- README-OSX.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README-OSX.md b/README-OSX.md index daadc66b4d..b0f6b9fed2 100644 --- a/README-OSX.md +++ b/README-OSX.md @@ -13,7 +13,7 @@ The dependencies you require are following: We recommend using [Homebrew](https://brew.sh) to facilitate this. With a working brew utility installed, run the following: ``` -$ brew install cmake yaml-cpp sdl12-compact sdl_gfx sdl_image sdl_mixer webp +$ brew install cmake yaml-cpp sdl12-compat sdl_gfx sdl_image sdl_mixer webp ``` This should install all of these necessary dependencies to their appropriate place under /usr/local.