iris/kaizen
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Trying to fix build on Windows

Browse Source
This commit is contained in:
CocoSimone
2022-10-26 22:34:05 +02:00
parent d15add0505
commit eb39588b62
4 changed files with 6 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@@ -6,9 +6,12 @@ roms/
*.bin *.bin
*.sh *.sh
.cache/ .cache/
.vs/
.vscode/ .vscode/
vgcore.* vgcore.*
*.dump *.dump
*.data *.data
disasm.txt disasm.txt
log.txt log.txt
CMakeSettings.json
out/

10
external/parallel-rdp/CMakeLists.txt vendored
View File

@@ -3,7 +3,6 @@ project(parallel-rdp)
file(GLOB_RECURSE parallel-rdp-cpp parallel-rdp-standalone/parallel-rdp/*.cpp) file(GLOB_RECURSE parallel-rdp-cpp parallel-rdp-standalone/parallel-rdp/*.cpp)
find_package(PkgConfig REQUIRED)
find_package(SDL2 REQUIRED) find_package(SDL2 REQUIRED)
add_library(parallel-rdp add_library(parallel-rdp
@@ -78,14 +77,7 @@ target_include_directories(parallel-rdp PUBLIC
. .
) )
if(WIN32) target_link_libraries(parallel-rdp ${SDL2_LIBRARIES})
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})
if(WIN32) if(WIN32)
target_compile_definitions(parallel-rdp PUBLIC VK_USE_PLATFORM_WIN32_KHR) target_compile_definitions(parallel-rdp PUBLIC VK_USE_PLATFORM_WIN32_KHR)

4
src/CMakeLists.txt
View File

@@ -9,9 +9,7 @@ file(GLOB_RECURSE CORE_HEADERS n64/*.hpp)
file(GLOB_RECURSE FRONTEND_SOURCES frontend/*.cpp) file(GLOB_RECURSE FRONTEND_SOURCES frontend/*.cpp)
file(GLOB_RECURSE FRONTEND_HEADERS frontend/*.hpp) file(GLOB_RECURSE FRONTEND_HEADERS frontend/*.hpp)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/modules") find_package(SDL2 REQUIRED)
find_package(SDL2 CONFIG REQUIRED)
find_package(nlohmann_json REQUIRED) find_package(nlohmann_json REQUIRED)
set(FMT_TEST BOOL "" FORCE OFF) set(FMT_TEST BOOL "" FORCE OFF)

36
src/n64/core/cpu/Registers.hpp
View File

@@ -14,40 +14,4 @@ struct Registers {
s64 hi, lo; s64 hi, lo;
bool prevDelaySlot, delaySlot; 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
};
} }