From 923c5f3ef5fbeeaf9d42ba80d2ce2696da7c90be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Miko=C5=82ajczyk?= Date: Fri, 25 Jul 2025 15:53:46 +0200 Subject: [PATCH] Include epoll-shim library (#3312) --- .gitmodules | 3 +++ CMakeLists.txt | 3 ++- externals/CMakeLists.txt | 4 ++++ externals/epoll-shim | 1 + 4 files changed, 10 insertions(+), 1 deletion(-) create mode 160000 externals/epoll-shim diff --git a/.gitmodules b/.gitmodules index a07201fa8..7e2361701 100644 --- a/.gitmodules +++ b/.gitmodules @@ -106,3 +106,6 @@ [submodule "externals/ext-libusb"] path = externals/ext-libusb url = https://github.com/shadps4-emu/ext-libusb.git +[submodule "externals/epoll-shim"] + path = externals/epoll-shim + url = https://github.com/jiixyj/epoll-shim.git diff --git a/CMakeLists.txt b/CMakeLists.txt index d92804ee8..4cdb2319d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -246,6 +246,7 @@ find_package(Zydis 5.0.0 CONFIG) find_package(pugixml 1.14 CONFIG) if (APPLE) find_package(date 3.0.1 CONFIG) + find_package(epoll-shim 3.14 CONFIG) endif() list(POP_BACK CMAKE_MODULE_PATH) @@ -1174,7 +1175,7 @@ if (APPLE) endif() # Replacement for std::chrono::time_zone - target_link_libraries(shadps4 PRIVATE date::date-tz) + target_link_libraries(shadps4 PRIVATE date::date-tz epoll-shim) endif() if (ENABLE_QT_GUI) diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 1296c8db7..c0c39508a 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -229,4 +229,8 @@ if (APPLE) if (NOT TARGET MoltenVK) add_subdirectory(MoltenVK) endif() + + if (NOT TARGET epoll-shim) + add_subdirectory(epoll-shim) + endif() endif() diff --git a/externals/epoll-shim b/externals/epoll-shim new file mode 160000 index 000000000..18159584b --- /dev/null +++ b/externals/epoll-shim @@ -0,0 +1 @@ +Subproject commit 18159584bb3d17e601b9315a7398ace018251bdc