mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-07-24 02:54:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

updated sdl3 , zlib-ng can now be build with msvc+clangci

Browse Source
This commit is contained in:
georgemoralis 2024-03-21 12:28:13 +02:00
parent 686cc0617e
commit 555c0f0a28
5 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -48,9 +48,6 @@
[submodule "externals/zlib-ng"] [submodule "externals/zlib-ng"]
path = externals/zlib-ng path = externals/zlib-ng
url = https://github.com/shadps4-emu/ext-zlib-ng.git url = https://github.com/shadps4-emu/ext-zlib-ng.git
[submodule "externals/zlib-ng-win"]
path = externals/zlib-ng-win
url = https://github.com/shadps4-emu/ext-zlib-ng-win.git
[submodule "externals/sdl3"] [submodule "externals/sdl3"]
path = externals/sdl3 path = externals/sdl3
url = https://github.com/shadps4-emu/ext-SDL.git url = https://github.com/shadps4-emu/ext-SDL.git

18
externals/CMakeLists.txt vendored
View File

@ -16,24 +16,20 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND MSVC)
# CryptoPP # CryptoPP
add_subdirectory(cryptoppwin EXCLUDE_FROM_ALL) add_subdirectory(cryptoppwin EXCLUDE_FROM_ALL)
target_include_directories(cryptoppwin INTERFACE cryptoppwin/include) target_include_directories(cryptoppwin INTERFACE cryptoppwin/include)
# Zlib-Ng
add_subdirectory(zlib-ng-win EXCLUDE_FROM_ALL)
target_include_directories(zlib INTERFACE zlib-ng-win/include)
else() else()
# CryptoPP # CryptoPP
set(CRYPTOPP_BUILD_TESTING OFF) set(CRYPTOPP_BUILD_TESTING OFF)
set(CRYPTOPP_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/cryptopp/) set(CRYPTOPP_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/cryptopp/)
add_subdirectory(cryptopp-cmake EXCLUDE_FROM_ALL) add_subdirectory(cryptopp-cmake EXCLUDE_FROM_ALL)
# Zlib-Ng
set(ZLIB_ENABLE_TESTS OFF)
set(WITH_GTEST OFF)
set(WITH_NEW_STRATEGIES ON)
set(WITH_NATIVE_INSTRUCTIONS ON)
add_subdirectory(zlib-ng)
endif() endif()
# Zlib-Ng
set(ZLIB_ENABLE_TESTS OFF)
set(WITH_GTEST OFF)
set(WITH_NEW_STRATEGIES ON)
set(WITH_NATIVE_INSTRUCTIONS ON)
add_subdirectory(zlib-ng)
if(NOT ENABLE_QT_GUI) if(NOT ENABLE_QT_GUI)
# SDL3 # SDL3
add_subdirectory(sdl3 EXCLUDE_FROM_ALL) add_subdirectory(sdl3 EXCLUDE_FROM_ALL)

2
externals/sdl3 vendored

@ -1 +1 @@
Subproject commit 495e432fb9776fdc13a8d96179136064ccddf6e5 Subproject commit 70b0d33106e98176bf44de5d301855d49587fa50

2
externals/zlib-ng vendored

@ -1 +1 @@
Subproject commit 3ac71d9e2f860ac3634b43a99892255eb39179cf Subproject commit af8169a724bd607e4e8c7de2a705ab17206217d6

1
externals/zlib-ng-win vendored

@ -1 +0,0 @@
Subproject commit 6ad2df3e3c2e58c009f70936a8c510b939bca1d9