Skip to content

Fix macos Ventura build fix #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
vkravets wants to merge 2 commits into from
Closed

Fix macos Ventura build fix #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
996508e
Fix macos Ventura build fix
vkravets Jun 21, 2023
9bfbf44
Update README-OSX.md
vkravets Nov 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion README-OSX.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-compat sdl_gfx sdl_image sdl_mixer webp
```
This should install all of these necessary dependencies to their appropriate place under /usr/local.

Expand Down