From 9d5fd281d688d758af016dc81d73c943c0f0142d Mon Sep 17 00:00:00 2001 From: Magnus Norddahl Date: Thu, 4 Jul 2024 10:58:53 +0200 Subject: [PATCH] Increase macOS minimum version to 10.15 --- CMakeLists.txt | 2 +- libraries/ZVulkan/src/glslang/glslang/Include/InfoSink.h | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 02b844269..0ccc1806e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -304,7 +304,7 @@ else() if( APPLE ) - set(CMAKE_OSX_DEPLOYMENT_TARGET "10.13") + set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15") if( CMAKE_CXX_COMPILER_ID STREQUAL "GNU" ) # If we're compiling with a custom GCC on the Mac (which we know since g++-4.2 doesn't support C++11) statically link libgcc. set( ALL_C_FLAGS "-static-libgcc" ) diff --git a/libraries/ZVulkan/src/glslang/glslang/Include/InfoSink.h b/libraries/ZVulkan/src/glslang/glslang/Include/InfoSink.h index 04c925383..23f495dcb 100644 --- a/libraries/ZVulkan/src/glslang/glslang/Include/InfoSink.h +++ b/libraries/ZVulkan/src/glslang/glslang/Include/InfoSink.h @@ -100,10 +100,6 @@ public: char locText[maxSize]; snprintf(locText, maxSize, ":%d", loc.line); -#ifdef __APPLE__ // crapple only implemented std::filesystem::absolute on the very latest macOS. - std::string location = loc.getStringNameOrNum(false); - append(location); -#else if(loc.getFilename() == nullptr && shaderFileName != nullptr && absolute) { append(std::filesystem::absolute(shaderFileName).string()); } else { @@ -114,7 +110,6 @@ public: append(location); } } -#endif append(locText); append(": ");