From 58123ef9c9b9799bb7ee42a121f5dfbba36dd683 Mon Sep 17 00:00:00 2001 From: lizzie Date: Sun, 9 Aug 2026 16:12:22 +0000 Subject: [PATCH] let openbsd be fucked then i guess (FOR NOW) --- CMakeLists.txt | 14 ++++---------- docs/Caveats.md | 4 +++- src/video_core/CMakeLists.txt | 6 +----- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index da3cd1bb69..15afe66226 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,18 +23,12 @@ include(CMakeDependentOption) include(CTest) include(CPMUtil) -if (NOT DEFINED ARCHITECTURE) - message(FATAL_ERROR "Architecture didn't make it out of scope, did you delete DetectArchitecture.cmake?") +if (CXX_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "14.0") + message(FATAL_ERROR "You must use gcc14 (or newer) feel free to fix clang yourself otherwise.") endif() -if (PLATFORM_OPENBSD) - # OpenBSD 7.8 broke libcxx when upgrading, so we must define the PSTL backend manually - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_LIBCPP_PSTL_BACKEND_SERIAL=1") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_LIBCPP_PSTL_BACKEND_SERIAL=1") -elseif (PLATFORM_NETBSD) - if (NOT CXX_GCC OR CMAKE_CXX_COMPILER_VERSION VERSION_LESS "14.0") - message(FATAL_ERROR "You must use gcc14 (or newer) from pkgin; feel free to fix clang yourself otherwise.") - endif() +if (NOT DEFINED ARCHITECTURE) + message(FATAL_ERROR "Architecture didn't make it out of scope, did you delete DetectArchitecture.cmake?") endif() # NetBSD: Fun for the whole family! diff --git a/docs/Caveats.md b/docs/Caveats.md index c5b925f4cd..4e6fb8e60a 100644 --- a/docs/Caveats.md +++ b/docs/Caveats.md @@ -71,7 +71,7 @@ export LIBGL_ALWAYS_SOFTWARE=1 Install `developer/gcc14` on OmniOS using pkgsrc. -Since so many dependencies are missing on `OmniOS`, you may wish to use `-DCPMUTIL_FORCE_BUNDLED=ON` +Since so many dependencies are missing on `OmniOS`, you may wish to use `-DCPMUTIL_FORCE_BUNDLED=ON` and `-DYUZU_USE_BUNDLED_OPENSSL=OFF`. For OmniOS you are required to build glslang yourself: ```sh @@ -92,6 +92,8 @@ You may also need to install `gmake` in order to properly build FFmpeg, this is If it wasn't obvious already, you require a X11 server to properly run the emulator within OmniOS, [this guide](https://web.archive.org/web/20260424200928/https://geekblood.wordpress.com/2017/10/26/installing-x11-and-a-desktop-environment-on-omnios/) is a great starting point for that, the links to pkgsrc are outdated so follow [this exemplar](https://pkgsrc.smartos.org/install-on-illumos/) as well: +For Solaris based OSes, `${CMAKE_SYSTEM_NAME}` isn't properly set on CMake (it's set to i686 on AMD64), you may find issues when building OpenSSL from `openssl-cmake`. + ## HaikuOS It's recommended to do a `pkgman full-sync` before installing. See [HaikuOS: Installing applications](https://www.haiku-os.org/guides/daily-tasks/install-applications/). Sometimes the process may be interrupted by an error like "Interrupted syscall". Simply firing the command again fixes the issue. By default `g++` is included on the default installation. diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt index c2ebfa1b50..64bcd875b6 100644 --- a/src/video_core/CMakeLists.txt +++ b/src/video_core/CMakeLists.txt @@ -326,11 +326,7 @@ if (ENABLE_OPENGL) ) endif() -# Since this is also used by header-only whom is public: -# a) you must also make it public -# b) should precede the headers themselves -# c) since targets also export targets publicly, this should precede them as well -# must match src/video_core/vulkan_common/vulkan.h logic +# Must match src/video_core/vulkan_common/vulkan.h X11 logic if (WIN32 OR APPLE OR ANDROID OR PLATFORM_HAIKU OR PLATFORM_PS4) # ... else()