diff --git a/.gitignore b/.gitignore index 42daa649..8bbcc357 100644 --- a/.gitignore +++ b/.gitignore @@ -6,9 +6,12 @@ roms/ *.bin *.sh .cache/ +.vs/ .vscode/ vgcore.* *.dump *.data disasm.txt -log.txt \ No newline at end of file +log.txt +CMakeSettings.json +out/ \ No newline at end of file diff --git a/external/parallel-rdp/CMakeLists.txt b/external/parallel-rdp/CMakeLists.txt index 1d100029..072fd353 100644 --- a/external/parallel-rdp/CMakeLists.txt +++ b/external/parallel-rdp/CMakeLists.txt @@ -3,7 +3,6 @@ project(parallel-rdp) file(GLOB_RECURSE parallel-rdp-cpp parallel-rdp-standalone/parallel-rdp/*.cpp) -find_package(PkgConfig REQUIRED) find_package(SDL2 REQUIRED) add_library(parallel-rdp @@ -78,14 +77,7 @@ target_include_directories(parallel-rdp PUBLIC . ) -if(WIN32) - target_compile_options(parallel-rdp PUBLIC -mwindows) - set(LIBRARIES -static z stdc++ user32 gdi32 winmm Imm32 ole32 oleaut32 shell32 setupapi version uuid) -else() - set(LIBRARIES ) -endif() - -target_link_libraries(parallel-rdp ${SDL2_LIBRARIES} ${LIBRARIES}) +target_link_libraries(parallel-rdp ${SDL2_LIBRARIES}) if(WIN32) target_compile_definitions(parallel-rdp PUBLIC VK_USE_PLATFORM_WIN32_KHR) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ee2bc7ef..19699916 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -9,9 +9,7 @@ file(GLOB_RECURSE CORE_HEADERS n64/*.hpp) file(GLOB_RECURSE FRONTEND_SOURCES frontend/*.cpp) file(GLOB_RECURSE FRONTEND_HEADERS frontend/*.hpp) -list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/modules") - -find_package(SDL2 CONFIG REQUIRED) +find_package(SDL2 REQUIRED) find_package(nlohmann_json REQUIRED) set(FMT_TEST BOOL "" FORCE OFF) diff --git a/src/n64/core/cpu/Registers.hpp b/src/n64/core/cpu/Registers.hpp index 32bfc424..d427181e 100644 --- a/src/n64/core/cpu/Registers.hpp +++ b/src/n64/core/cpu/Registers.hpp @@ -14,40 +14,4 @@ struct Registers { s64 hi, lo; bool prevDelaySlot, delaySlot; }; - -constexpr char* gprStr[32] = { - "zero", // 0 - "at", // 1 - "v0", // 2 - "v1", // 3 - "a0", // 4 - "a1", // 5 - "a2", // 6 - "a3", // 7 - "t0", // 8 - "t1", // 9 - "t2", // 10 - "t3", // 11 - "t4", // 12 - "t5", // 13 - "t6", // 14 - "t7", // 15 - "s0", // 16 - "s1", // 17 - "s2", // 18 - "s3", // 19 - "s4", // 20 - "s5", // 21 - "s6", // 22 - "s7", // 23 - "t8", // 24 - "t9", // 25 - "k0", // 26 - "k1", // 27 - "gp", // 28 - "sp", // 29 - "s8", // 30 - "ra" // 31 -}; - }