From 4fee6f307191dfae22032a470f613bbd786d713a Mon Sep 17 00:00:00 2001 From: Simone Date: Thu, 16 May 2024 11:31:18 +0200 Subject: [PATCH] Do this like in master --- src/backend/core/mmio/CMakeLists.txt | 4 +++- src/frontend/CMakeLists.txt | 4 +--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/backend/core/mmio/CMakeLists.txt b/src/backend/core/mmio/CMakeLists.txt index 41c3a4c2..a5ec7c7e 100644 --- a/src/backend/core/mmio/CMakeLists.txt +++ b/src/backend/core/mmio/CMakeLists.txt @@ -1,5 +1,7 @@ file(GLOB_RECURSE SOURCES *.cpp) file(GLOB_RECURSE HEADERS *.hpp) +find_package(SDL2 CONFIG REQUIRED) -add_library(mmio ${SOURCES} ${HEADERS} ../../../../external/cic_nus_6105/n64_cic_nus_6105.cpp) \ No newline at end of file +add_library(mmio ${SOURCES} ${HEADERS} ../../../../external/cic_nus_6105/n64_cic_nus_6105.cpp) +target_link_libraries(mmio PRIVATE SDL2::SDL2) \ No newline at end of file diff --git a/src/frontend/CMakeLists.txt b/src/frontend/CMakeLists.txt index 5eee3961..1a4db0b6 100644 --- a/src/frontend/CMakeLists.txt +++ b/src/frontend/CMakeLists.txt @@ -32,7 +32,6 @@ include_directories( ../../external/imgui/imgui ../../external/imgui/imgui/backends ../../external/unarr - ${SDL2_INCLUDE_DIRS} ) option(RAPIDJSON_BUILD_DOC "Build rapidjson documentation." OFF) @@ -72,8 +71,7 @@ add_executable(kaizen-qt InputSettings.hpp InputSettings.cpp) -target_link_libraries(kaizen-qt PUBLIC Qt6::Core Qt6::Gui Qt6::Widgets fmt mio nlohmann_json nfd SDL2::SDL2 parallel-rdp backend) -target_compile_definitions(kaizen-qt PUBLIC SDL_MAIN_HANDLED) +target_link_libraries(kaizen-qt PUBLIC Qt6::Core Qt6::Gui Qt6::Widgets fmt mio nlohmann_json nfd parallel-rdp backend) file(COPY ../../resources/ DESTINATION ${PROJECT_BINARY_DIR}/resources/) file(REMOVE