diff --git a/src/backend/core/mmio/CMakeLists.txt b/src/backend/core/mmio/CMakeLists.txt index e22d826e..41c3a4c2 100644 --- a/src/backend/core/mmio/CMakeLists.txt +++ b/src/backend/core/mmio/CMakeLists.txt @@ -1,8 +1,5 @@ file(GLOB_RECURSE SOURCES *.cpp) file(GLOB_RECURSE HEADERS *.hpp) -find_package(SDL2 REQUIRED) -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 +add_library(mmio ${SOURCES} ${HEADERS} ../../../../external/cic_nus_6105/n64_cic_nus_6105.cpp) \ No newline at end of file diff --git a/src/backend/core/registers/cop/cop1instructions.cpp b/src/backend/core/registers/cop/cop1instructions.cpp index 31b2a536..feccac3a 100644 --- a/src/backend/core/registers/cop/cop1instructions.cpp +++ b/src/backend/core/registers/cop/cop1instructions.cpp @@ -915,9 +915,8 @@ void Cop1::truncld(u32 instr) { template void Cop1::lwc1(T &cpu, Mem &mem, u32 instr) { if constexpr(std::is_same_v) { - Registers& regs = cpu.regs; CheckFPUUsable_PreserveCause(); - lwc1Interp(cpu.regs, mem, instr); + lwc1Interp(mem, instr); } else if constexpr (std::is_same_v) { lwc1JIT(cpu, mem, instr); } else { @@ -931,9 +930,8 @@ template void Cop1::lwc1(JIT&, Mem&, u32); template void Cop1::swc1(T &cpu, Mem &mem, u32 instr) { if constexpr(std::is_same_v) { - Registers& regs = cpu.regs; CheckFPUUsable_PreserveCause(); - swc1Interp(cpu.regs, mem, instr); + swc1Interp(mem, instr); } else if constexpr (std::is_same_v) { swc1JIT(cpu, mem, instr); } else { @@ -947,9 +945,8 @@ template void Cop1::swc1(JIT&, Mem&, u32); template void Cop1::ldc1(T &cpu, Mem &mem, u32 instr) { if constexpr(std::is_same_v) { - Registers& regs = cpu.regs; CheckFPUUsable_PreserveCause(); - ldc1Interp(cpu.regs, mem, instr); + ldc1Interp(mem, instr); } else if constexpr (std::is_same_v) { ldc1JIT(cpu, mem, instr); } else { @@ -963,9 +960,8 @@ template void Cop1::ldc1(JIT&, Mem&, u32); template void Cop1::sdc1(T &cpu, Mem &mem, u32 instr) { if constexpr(std::is_same_v) { - Registers& regs = cpu.regs; CheckFPUUsable_PreserveCause(); - sdc1Interp(cpu.regs, mem, instr); + sdc1Interp(mem, instr); } else if constexpr (std::is_same_v) { sdc1JIT(cpu, mem, instr); } else { diff --git a/src/frontend/CMakeLists.txt b/src/frontend/CMakeLists.txt index 9ff6d82b..5eee3961 100644 --- a/src/frontend/CMakeLists.txt +++ b/src/frontend/CMakeLists.txt @@ -4,6 +4,7 @@ project(kaizen-qt) set(CMAKE_CXX_STANDARD 17) find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) +find_package(SDL2 REQUIRED) include_directories( . @@ -31,6 +32,7 @@ include_directories( ../../external/imgui/imgui ../../external/imgui/imgui/backends ../../external/unarr + ${SDL2_INCLUDE_DIRS} ) option(RAPIDJSON_BUILD_DOC "Build rapidjson documentation." OFF) @@ -70,7 +72,8 @@ 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 parallel-rdp backend) +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) file(COPY ../../resources/ DESTINATION ${PROJECT_BINARY_DIR}/resources/) file(REMOVE