From b100b47a2d649de147019d5b18daf4ce9fad625f 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 | 4 ++-- docs/Caveats.md | 2 ++ src/video_core/CMakeLists.txt | 6 +----- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 820ca8c281..b4cec45648 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,8 +24,8 @@ 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 (OPENBSD) diff --git a/docs/Caveats.md b/docs/Caveats.md index b86edf4d75..0b82ddecef 100644 --- a/docs/Caveats.md +++ b/docs/Caveats.md @@ -90,6 +90,8 @@ If it wasn't obvious already, you require a X11 server to properly run the emula 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`. +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 41349b518c..1bc03c8e0f 100644 --- a/src/video_core/CMakeLists.txt +++ b/src/video_core/CMakeLists.txt @@ -405,11 +405,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()