diff --git a/BUILDING b/BUILDING index 0fe4c36..b219f01 100644 --- a/BUILDING +++ b/BUILDING @@ -1,7 +1,10 @@ How to build cerritos 1. Install dependencies -cmake libsdl2 doxygen graphviz libsdl2-image-dev libsdl2-ttf-dev +Linux (package names may vary): +{your packager} libsdl2 doxygen graphviz libsdl2-image-dev libsdl2-ttf-dev freealut-dev +macOS: +brew install sdl2 doxygen graphviz sdl2_image sdl2_ttf freealut 2. Create build directory mkdir build diff --git a/CMakeLists.txt b/CMakeLists.txt index 05a1254..c5bcfa6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,6 +13,7 @@ set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) include(sdl) INCLUDE(FindPkgConfig) +find_package(OpenAL REQUIRED) #find_package(SDL_ttf REQUIRED) #PKG_SEARCH_MODULE(SDL2 REQUIRED sdl2) PKG_SEARCH_MODULE(SDL2IMAGE REQUIRED SDL2_image) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 24421d4..ada4b95 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -70,10 +70,6 @@ install(FILES ) target_include_directories(cerritos PUBLIC - ${SDL2_LIBRARIES} - ${SDL2IMAGE_INCLUDE_DIRS} - ${SDL2TTF_INCLUDE_DIRS} - ${OPENAL_INCLUDE_DIRS} . backend core @@ -85,14 +81,20 @@ target_include_directories(cerritos PUBLIC widgets ) +target_include_directories(cerritos SYSTEM PUBLIC + ${SDL2_INCLUDE_DIRS} + ${SDL2IMAGE_INCLUDE_DIRS} + ${SDL2TTF_INCLUDE_DIRS} + ${OPENAL_INCLUDE_DIR} +) + target_link_libraries(cerritos ${SDL2_LIBRARIES} ${SDL2IMAGE_LIBRARIES} ${SDL2TTF_LIBRARIES} - ${OPENAL_LIBRARIES} + ${OPENAL_LIBRARY} alut - stdc++fs - stdc++ + $<$,$,9.1>>:stdc++fs> ) install(TARGETS cerritos diff --git a/src/thirdparty/binreloc/binreloc.c b/src/thirdparty/binreloc/binreloc.c index 84c22c4..437718c 100644 --- a/src/thirdparty/binreloc/binreloc.c +++ b/src/thirdparty/binreloc/binreloc.c @@ -28,7 +28,11 @@ #include #include #include +#ifdef __APPLE__ +#include +#else #include +#endif #include "binreloc.h"