catto
/
shadPS4
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updates submodules to latest

This commit is contained in:
georgemoralis 2023-07-17 23:19:33 +03:00
parent 3d073e2ed4
commit 5180a282ed
8 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -15,8 +15,8 @@ include_directories(third-party/sdl/)
include_directories(third-party/fmt/include) include_directories(third-party/fmt/include)
include_directories(third-party/magic_enum/include) include_directories(third-party/magic_enum/include)
include_directories(third-party/zydis/include/Zydis) include_directories(third-party/zydis/include/Zydis)
include_directories(third-party/winpthread/include)
add_subdirectory("third-party") add_subdirectory("third-party")
#=================== EXAMPLE =================== #=================== EXAMPLE ===================
add_executable(shadps4 add_executable(shadps4
@ -37,10 +37,12 @@ add_executable(shadps4
"src/Util/Singleton.h" "src/Util/Disassembler.cpp" "src/Util/Disassembler.h" "src/Util/StringUtil.h" "src/Core/PS4/Util/aerolib.h" "src/Core/PS4/Loader/SymbolsResolver.h" "src/Core/PS4/Loader/SymbolsResolver.cpp" "src/Core/PS4/HLE/Libs.cpp" "src/Core/PS4/HLE/Libs.h" "src/Core/PS4/HLE/LibC.cpp" "src/Core/PS4/HLE/LibC.h" "src/Lib/Timer.cpp" "src/Lib/Timer.h" "src/Core/PS4/HLE/LibKernel.cpp" "src/Core/PS4/HLE/LibKernel.h" "src/Core/PS4/HLE/LibSceVideoOut.cpp" "src/Core/PS4/HLE/LibSceVideoOut.h" "src/Core/PS4/HLE/LibSceGnmDriver.cpp" "src/Core/PS4/HLE/LibSceGnmDriver.h") "src/Util/Singleton.h" "src/Util/Disassembler.cpp" "src/Util/Disassembler.h" "src/Util/StringUtil.h" "src/Core/PS4/Util/aerolib.h" "src/Core/PS4/Loader/SymbolsResolver.h" "src/Core/PS4/Loader/SymbolsResolver.cpp" "src/Core/PS4/HLE/Libs.cpp" "src/Core/PS4/HLE/Libs.h" "src/Core/PS4/HLE/LibC.cpp" "src/Core/PS4/HLE/LibC.h" "src/Lib/Timer.cpp" "src/Lib/Timer.h" "src/Core/PS4/HLE/LibKernel.cpp" "src/Core/PS4/HLE/LibKernel.h" "src/Core/PS4/HLE/LibSceVideoOut.cpp" "src/Core/PS4/HLE/LibSceVideoOut.h" "src/Core/PS4/HLE/LibSceGnmDriver.cpp" "src/Core/PS4/HLE/LibSceGnmDriver.h")
find_package(OpenGL REQUIRED) find_package(OpenGL REQUIRED)
target_link_libraries(shadps4 PUBLIC fmt spdlog IMGUI SDL3-shared ${OPENGL_LIBRARY}) target_link_libraries(shadps4 PUBLIC fmt spdlog IMGUI SDL3-shared ${OPENGL_LIBRARY})
add_custom_command(TARGET shadps4 POST_BUILD add_custom_command(TARGET shadps4 POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different COMMAND ${CMAKE_COMMAND} -E copy_if_different
$<TARGET_FILE:SDL3-shared> $<TARGET_FILE:SDL3-shared>
$<TARGET_FILE_DIR:shadps4>) $<TARGET_FILE_DIR:shadps4>)
add_custom_command(TARGET shadps4 POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
"${PROJECT_SOURCE_DIR}/third-party/winpthread/bin/libwinpthread-1.dll" $<TARGET_FILE_DIR:shadps4>)

2
third-party/SDL vendored

@ -1 +1 @@
Subproject commit 125e7420ecd2b0d1847aef804f53e614fbc68253 Subproject commit 27556e098ecce54014ed1fc11c1e974ffdf4bc93

2
third-party/fmt vendored

@ -1 +1 @@
Subproject commit de0757b578244e0bf7ac50007fb5e25fcc899c7c Subproject commit 661b23edeb52d400cf5812e7330f14f05c072fab

2
third-party/imgui vendored

@ -1 +1 @@
Subproject commit 4fab72b40e2972f5d56fc884ed5797446238844e Subproject commit 52125a54a57a458e89bc61502010e964add3cdd5

2
third-party/magic_enum vendored

@ -1 +1 @@
Subproject commit 5018ef9677521983bfedb127901284432d1a05a2 Subproject commit 4904822db8770d04444add00a9e155568d3e8bd1

2
third-party/spdlog vendored

@ -1 +1 @@
Subproject commit 5a6b6cafa8d4aee3e6d0dd16a2cae9169141c831 Subproject commit 76dfc7e7c0d3c69d3cdaa3399b63545235ccbb02

2
third-party/winpthread vendored

@ -1 +1 @@
Subproject commit e6a93f2050226b33347ca753fa94f6b1a6c34f39 Subproject commit 918de958b720c3ba7bc47f4988609c0109a0f75b

2
third-party/zydis vendored

@ -1 +1 @@
Subproject commit d4c37ae7a9db989495eb66636a65d8d4ff69eb35 Subproject commit a6d0c713b71b5009634868389f0ff551871273d6