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

Merge branch 'master' into dynarec

Browse Source 
# Conflicts:
#	.github/workflows/build.yml
#	src/CMakeLists.txt
#	src/frontend/imgui/Window.cpp
#	src/n64/Core.cpp
#	src/n64/core/interpreter/cop/cop1instructions.cpp
#	src/n64/core/interpreter/decode.cpp
#	src/n64/core/registers/Cop1.cpp
This commit is contained in:
CocoSimone
2022-12-16 23:23:27 +01:00
parent 1aeddbfc9f 08e0903fa0
commit c1b57403cd
267 changed files with 50552 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,8 +32,9 @@ add_library(parallel-rdp
parallel-rdp-standalone/vulkan/texture_format.cpp
parallel-rdp-standalone/vulkan/wsi.cpp
parallel-rdp-standalone/vulkan/wsi.hpp
parallel-rdp-standalone/vulkan/wsi_timing.cpp
parallel-rdp-standalone/vulkan/wsi_timing.hpp
parallel-rdp-standalone/vulkan/memory_allocator.cpp
parallel-rdp-standalone/util/arena_allocator.cpp
parallel-rdp-standalone/vulkan/wsi.hpp
parallel-rdp-standalone/util/aligned_alloc.cpp
parallel-rdp-standalone/util/timer.cpp
parallel-rdp-standalone/util/timeline_trace_file.cpp
@@ -75,6 +76,7 @@ target_include_directories(parallel-rdp PUBLIC
../imgui/imgui
../imgui/imgui/backends
../fmt/include
../discord-rpc/include
.
)