Browse Source
[compat] Solaris build fixes for openssl, catch2; NetBSD build fixes (#2752)
[compat] Solaris build fixes for openssl, catch2; NetBSD build fixes (#2752)
Signed-off-by: lizzie <lizzie@eden-emu.dev> Co-authored-by: crueter <crueter@eden-emu.dev> Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/2752 Reviewed-by: Shinmegumi <shinmegumi@eden-emu.dev> Reviewed-by: crueter <crueter@eden-emu.dev> Reviewed-by: MaranBr <maranbr@eden-emu.dev> Co-authored-by: lizzie <lizzie@eden-emu.dev> Co-committed-by: lizzie <lizzie@eden-emu.dev>pull/2761/head
lizzie
2 months ago
committed by
crueter
crueter
No known key found for this signature in database
GPG Key ID: 425ACD2D4830EBC6
22 changed files with 242 additions and 95 deletions
-
6.gitignore
-
12.patch/catch2/0001-solaris-isnan-fix.patch
-
25.patch/libusb/0001-netbsd-gettime.patch
-
14.patch/spirv-tools/0001-netbsd-fix.patch
-
23CMakeLists.txt
-
3docs/CPMUtil.md
-
12docs/Caveats.md
-
81docs/Deps.md
-
3docs/user/Architectures.md
-
13externals/cpmfile.json
-
5externals/libusb/cpmfile.json
-
2externals/renderdoc/renderdoc_app.h
-
42src/common/demangle.cpp
-
16src/common/settings_enums.h
-
15src/dynarmic/src/dynarmic/common/context.h
-
11src/dynarmic/src/dynarmic/ir/dense_list.h
-
2src/dynarmic/src/dynarmic/ir/opt_passes.cpp
-
40src/dynarmic/tests/native/testenv.h
-
6src/qt_common/CMakeLists.txt
-
1src/qt_common/util/content.cpp
-
3src/qt_common/util/game.cpp
-
2src/qt_common/util/game.h
@ -0,0 +1,12 @@ |
|||||
|
diff --git a/src/catch2/matchers/catch_matchers_floating_point.cpp b/src/catch2/matchers/catch_matchers_floating_point.cpp
|
||||
|
index fc7b444..0e1a3c2 100644
|
||||
|
--- a/src/catch2/matchers/catch_matchers_floating_point.cpp
|
||||
|
+++ b/src/catch2/matchers/catch_matchers_floating_point.cpp
|
||||
|
@@ -5,6 +5,7 @@
|
||||
|
// https://www.boost.org/LICENSE_1_0.txt) |
||||
|
|
||||
|
// SPDX-License-Identifier: BSL-1.0 |
||||
|
+#include <catch2/internal/catch_polyfills.hpp>
|
||||
|
#include <catch2/matchers/catch_matchers_floating_point.hpp> |
||||
|
#include <catch2/internal/catch_enforce.hpp> |
||||
|
#include <catch2/internal/catch_polyfills.hpp> |
||||
@ -0,0 +1,25 @@ |
|||||
|
diff --git a/libusb/os/netbsd_usb.c b/libusb/os/netbsd_usb.c
|
||||
|
index a9a50b2..56e681b 100644
|
||||
|
--- a/libusb/os/netbsd_usb.c
|
||||
|
+++ b/libusb/os/netbsd_usb.c
|
||||
|
@@ -580,6 +580,20 @@ _access_endpoint(struct libusb_transfer *transfer)
|
||||
|
return hpriv->endpoints[endpt]; |
||||
|
} |
||||
|
|
||||
|
+void usbi_get_monotonic_time(struct timespec *tp) {
|
||||
|
+ struct timeval tv;
|
||||
|
+ gettimeofday(&tv, NULL);
|
||||
|
+ tp->tv_sec = tv.tv_sec;
|
||||
|
+ tp->tv_nsec = tv.tv_usec * 1000ull;
|
||||
|
+}
|
||||
|
+
|
||||
|
+void usbi_get_real_time(struct timespec *tp) {
|
||||
|
+ struct timeval tv;
|
||||
|
+ gettimeofday(&tv, NULL);
|
||||
|
+ tp->tv_sec = tv.tv_sec;
|
||||
|
+ tp->tv_nsec = tv.tv_usec * 1000ull;
|
||||
|
+}
|
||||
|
+
|
||||
|
int |
||||
|
_sync_gen_transfer(struct usbi_transfer *itransfer) |
||||
|
{ |
||||
@ -0,0 +1,14 @@ |
|||||
|
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
|
||||
|
index eb4e69e..3155805 100644
|
||||
|
--- a/external/CMakeLists.txt
|
||||
|
+++ b/external/CMakeLists.txt
|
||||
|
@@ -72,7 +72,8 @@ if (SPIRV_TOOLS_USE_MIMALLOC)
|
||||
|
pop_variable(MI_BUILD_TESTS) |
||||
|
endif() |
||||
|
|
||||
|
-if (DEFINED SPIRV-Headers_SOURCE_DIR)
|
||||
|
+# NetBSD doesn't have SPIRV-Headers readily available on system
|
||||
|
+if (DEFINED SPIRV-Headers_SOURCE_DIR AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL "NetBSD")
|
||||
|
# This allows flexible position of the SPIRV-Headers repo. |
||||
|
set(SPIRV_HEADER_DIR ${SPIRV-Headers_SOURCE_DIR}) |
||||
|
else() |
||||
Write
Preview
Loading…
Cancel
Save
Reference in new issue