diff --git a/.gitmodules b/.gitmodules index d787a77aa..19d01b70e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -48,9 +48,6 @@ [submodule "externals/zlib-ng"] path = externals/zlib-ng 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"] path = externals/sdl3 url = https://github.com/shadps4-emu/ext-SDL.git diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 3c3937449..3e4e201f2 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -16,24 +16,20 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND MSVC) # CryptoPP add_subdirectory(cryptoppwin EXCLUDE_FROM_ALL) 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() # CryptoPP set(CRYPTOPP_BUILD_TESTING OFF) set(CRYPTOPP_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/cryptopp/) 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() +# 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) # SDL3 add_subdirectory(sdl3 EXCLUDE_FROM_ALL) diff --git a/externals/sdl3 b/externals/sdl3 index 495e432fb..70b0d3310 160000 --- a/externals/sdl3 +++ b/externals/sdl3 @@ -1 +1 @@ -Subproject commit 495e432fb9776fdc13a8d96179136064ccddf6e5 +Subproject commit 70b0d33106e98176bf44de5d301855d49587fa50 diff --git a/externals/zlib-ng b/externals/zlib-ng index 3ac71d9e2..af8169a72 160000 --- a/externals/zlib-ng +++ b/externals/zlib-ng @@ -1 +1 @@ -Subproject commit 3ac71d9e2f860ac3634b43a99892255eb39179cf +Subproject commit af8169a724bd607e4e8c7de2a705ab17206217d6 diff --git a/externals/zlib-ng-win b/externals/zlib-ng-win deleted file mode 160000 index 6ad2df3e3..000000000 --- a/externals/zlib-ng-win +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6ad2df3e3c2e58c009f70936a8c510b939bca1d9