diff options
| author | Anonymous Maarten <anonymous.maarten@gmail.com> | 2021-07-05 16:02:10 +0200 |
|---|---|---|
| committer | Adrian Graber <adrian@adriangraber.com> | 2021-07-13 00:50:49 +0200 |
| commit | a247d533675a3ffa3b5f3722bef4d55e5a912d03 (patch) | |
| tree | 39a342fab25075ebb02885b0a3d7c13d112901ce | |
| parent | Replace GTA_SWITCH macro and use GAMEPAD_MENU (diff) | |
| download | re3-a247d533675a3ffa3b5f3722bef4d55e5a912d03.tar re3-a247d533675a3ffa3b5f3722bef4d55e5a912d03.tar.gz re3-a247d533675a3ffa3b5f3722bef4d55e5a912d03.tar.bz2 re3-a247d533675a3ffa3b5f3722bef4d55e5a912d03.tar.lz re3-a247d533675a3ffa3b5f3722bef4d55e5a912d03.tar.xz re3-a247d533675a3ffa3b5f3722bef4d55e5a912d03.tar.zst re3-a247d533675a3ffa3b5f3722bef4d55e5a912d03.zip | |
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 16 |
2 files changed, 13 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b687124a..8bfe3656 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.14) set(EXECUTABLE re3) set(PROJECT RE3) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2989c145..4de36572 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -54,9 +54,13 @@ target_compile_definitions(${EXECUTABLE} PRIVATE USE_OUR_VERSIONING) if(${PROJECT}_AUDIO STREQUAL "OAL") find_package(OpenAL REQUIRED) - target_include_directories(${EXECUTABLE} PRIVATE ${OPENAL_INCLUDE_DIR}) - target_link_libraries(${EXECUTABLE} PRIVATE ${OPENAL_LIBRARY}) - target_compile_definitions(${EXECUTABLE} PRIVATE ${OPENAL_DEFINITIONS}) + if(TARGET OpenAL::OpenAL) + target_link_libraries(${EXECUTABLE} PRIVATE OpenAL::OpenAL) + else() + target_include_directories(${EXECUTABLE} PRIVATE ${OPENAL_INCLUDE_DIR}) + target_link_libraries(${EXECUTABLE} PRIVATE ${OPENAL_LIBRARY}) + target_compile_definitions(${EXECUTABLE} PRIVATE ${OPENAL_DEFINITIONS}) + endif() target_compile_definitions(${EXECUTABLE} PRIVATE AUDIO_OAL) elseif(${PROJECT}_AUDIO STREQUAL "MSS") find_package(MilesSDK REQUIRED) @@ -126,6 +130,11 @@ else() set(${PROJECT}_C_CXX_EXTENSIONS OFF) endif() +if(NOT (WINDOWS OR APPLE OR NINTENDO_SWITCH)) + find_package(X11 REQUIRED) + target_link_libraries(${EXECUTABLE} PRIVATE X11::X11) +endif() + set_target_properties(${EXECUTABLE} PROPERTIES C_STANDARD 11 @@ -151,7 +160,6 @@ endif() if(NINTENDO_SWITCH) # Needed for OpenAL-Soft target_link_libraries(${EXECUTABLE} PRIVATE - openal # HACK - something broke with latest cmake SDL2 ) |