mirror of
https://github.com/shadps4-emu/shadPS4.git
synced 2025-05-27 22:03:20 +00:00
several fixes (#112)
* updated fmt * submodules updated * fixed _TIMESPEC_DEFINED for winpthreads under windows * fixed sdl3 under qt * virtual_memory: Ensure mapped addresses stay inside the user area * Fixes LLE Libc crashing on linux --------- Co-authored-by: GPUCode <geoster3d@gmail.com>
This commit is contained in:
parent
5ed4891a1f
commit
e99129d72f
12 changed files with 20 additions and 26 deletions
5
externals/CMakeLists.txt
vendored
5
externals/CMakeLists.txt
vendored
|
@ -6,6 +6,9 @@ if (MSVC)
|
|||
add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS)
|
||||
endif()
|
||||
|
||||
# fmtlib
|
||||
add_subdirectory(fmt EXCLUDE_FROM_ALL)
|
||||
|
||||
# Discord-RPC
|
||||
set(BUILD_EXAMPLES OFF CACHE BOOL "")
|
||||
add_subdirectory(discord-rpc EXCLUDE_FROM_ALL)
|
||||
|
@ -30,7 +33,5 @@ set(WITH_NEW_STRATEGIES ON)
|
|||
set(WITH_NATIVE_INSTRUCTIONS ON)
|
||||
add_subdirectory(zlib-ng)
|
||||
|
||||
if(NOT ENABLE_QT_GUI)
|
||||
# SDL3
|
||||
add_subdirectory(sdl3 EXCLUDE_FROM_ALL)
|
||||
endif()
|
||||
|
|
2
externals/cryptopp-cmake
vendored
2
externals/cryptopp-cmake
vendored
|
@ -1 +1 @@
|
|||
Subproject commit a99c80c26686e44eddf0432140ae397f3efbd0b3
|
||||
Subproject commit 19cd13af5f7fa4904b174b81e98852283dbe8c1f
|
1
externals/fmt
vendored
Submodule
1
externals/fmt
vendored
Submodule
|
@ -0,0 +1 @@
|
|||
Subproject commit aa52eb765dec0eb67fab4b035a4a05b82346c8f5
|
2
externals/sdl3
vendored
2
externals/sdl3
vendored
|
@ -1 +1 @@
|
|||
Subproject commit c8a066019b686351afc614a44a2111111c42d697
|
||||
Subproject commit cbb3c69cb0d771cdd221339aa1a064c55ec6e67d
|
2
externals/zlib-ng
vendored
2
externals/zlib-ng
vendored
|
@ -1 +1 @@
|
|||
Subproject commit af8169a724bd607e4e8c7de2a705ab17206217d6
|
||||
Subproject commit 3f35bfccff2d1dacdfe9844712be1e042d028700
|
Loading…
Add table
Add a link
Reference in a new issue