From 2f74c6684462ab0b2f8db5bdcde46c87efc285e5 Mon Sep 17 00:00:00 2001 From: Iskender Abdullayev Date: Mon, 17 Nov 2025 15:22:17 +0100 Subject: [PATCH] Merge branch 'main' into project_tests -tried to repair -works with newer c-make versions # Conflicts: # CMakeLists.txt # gamecube.cpp # gamecube.h # tests.cpp --- CMakeLists.txt | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cc82bd3..21b5360 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,6 +3,9 @@ project(Prog3B) set(CMAKE_CXX_STANDARD 17) +# WICHTIG: wegen raylib + neuer CMake-Version +set(CMAKE_POLICY_VERSION_MINIMUM 3.5) + include(FetchContent) FetchContent_Declare( @@ -20,4 +23,14 @@ add_executable(Prog3B ) target_include_directories(Prog3B PRIVATE .) -target_link_libraries(Prog3B raylib) \ No newline at end of file +target_link_libraries(Prog3B raylib) + +# macOS-Frameworks nicht vergessen: +if(APPLE) + target_link_libraries(Prog3B + "-framework Cocoa" + "-framework IOKit" + "-framework CoreVideo" + "-framework OpenGL" + ) +endif()