mirror of
https://github.com/shadps4-emu/shadPS4.git
synced 2024-12-29 11:06:07 +00:00
use winpthreads from mingw64
This commit is contained in:
parent
e7c82cee5e
commit
e55fbee0aa
7
.gitmodules
vendored
7
.gitmodules
vendored
|
@ -6,10 +6,6 @@
|
|||
path = third-party/zydis
|
||||
url = https://github.com/zyantific/zydis.git
|
||||
shallow = true
|
||||
[submodule "third-party/winpthread"]
|
||||
path = third-party/winpthread
|
||||
url = https://github.com/shadps4/winpthread.git
|
||||
branch = main
|
||||
[submodule "third-party/toml11"]
|
||||
path = third-party/toml11
|
||||
url = https://github.com/ToruNiina/toml11
|
||||
|
@ -64,3 +60,6 @@
|
|||
[submodule "externals/xbyak"]
|
||||
path = externals/xbyak
|
||||
url = https://github.com/herumi/xbyak
|
||||
[submodule "externals/winpthreads"]
|
||||
path = externals/winpthreads
|
||||
url = https://github.com/shadps4-emu/winpthreads.git
|
||||
|
|
|
@ -403,7 +403,7 @@ if (ENABLE_QT_GUI)
|
|||
endif()
|
||||
|
||||
if (WIN32)
|
||||
target_link_libraries(shadps4 PRIVATE mincore winpthread clang_rt.builtins-x86_64.lib)
|
||||
target_link_libraries(shadps4 PRIVATE mincore winpthreads clang_rt.builtins-x86_64.lib)
|
||||
add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS)
|
||||
add_definitions(-DNOMINMAX -DWIN32_LEAN_AND_MEAN)
|
||||
if (MSVC)
|
||||
|
@ -438,9 +438,3 @@ add_custom_command(TARGET shadps4 POST_BUILD
|
|||
COMMAND ${CMAKE_COMMAND} -E copy_if_different
|
||||
$<TARGET_FILE:SDL3-shared>
|
||||
$<TARGET_FILE_DIR:shadps4>)
|
||||
|
||||
if (WIN32)
|
||||
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>)
|
||||
endif()
|
||||
|
|
6
externals/CMakeLists.txt
vendored
6
externals/CMakeLists.txt
vendored
|
@ -66,3 +66,9 @@ add_subdirectory(robin-map EXCLUDE_FROM_ALL)
|
|||
|
||||
# Xbyak
|
||||
add_subdirectory(xbyak EXCLUDE_FROM_ALL)
|
||||
|
||||
# Winpthreads
|
||||
if (WIN32)
|
||||
add_subdirectory(winpthreads EXCLUDE_FROM_ALL)
|
||||
target_include_directories(winpthreads INTERFACE winpthreads/include)
|
||||
endif()
|
||||
|
|
1
externals/winpthreads
vendored
Submodule
1
externals/winpthreads
vendored
Submodule
|
@ -0,0 +1 @@
|
|||
Subproject commit d937b60055aaea313422672ebd5cc8bfa87a1682
|
|
@ -8,6 +8,9 @@
|
|||
#include "core/libraries/error_codes.h"
|
||||
#include "core/libraries/kernel/thread_management.h"
|
||||
#include "core/libraries/libs.h"
|
||||
#ifdef _WIN64
|
||||
#include <windows.h>
|
||||
#endif
|
||||
|
||||
namespace Libraries::Kernel {
|
||||
|
||||
|
|
6
third-party/CMakeLists.txt
vendored
6
third-party/CMakeLists.txt
vendored
|
@ -15,12 +15,6 @@ add_subdirectory(toml11 EXCLUDE_FROM_ALL)
|
|||
# Vulkan
|
||||
add_subdirectory(vulkan EXCLUDE_FROM_ALL)
|
||||
|
||||
# Winpthreads
|
||||
if (WIN32)
|
||||
add_subdirectory(winpthread EXCLUDE_FROM_ALL)
|
||||
target_include_directories(winpthread INTERFACE winpthread/include)
|
||||
endif()
|
||||
|
||||
# xxHash
|
||||
add_library(xxhash INTERFACE)
|
||||
target_include_directories(xxhash INTERFACE xxhash)
|
||||
|
|
1
third-party/winpthread
vendored
1
third-party/winpthread
vendored
|
@ -1 +0,0 @@
|
|||
Subproject commit 918de958b720c3ba7bc47f4988609c0109a0f75b
|
Loading…
Reference in a new issue