OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Increase macOS minimum version to 10.15

Browse source
This commit is contained in:
Magnus Norddahl 2024-07-04 10:58:53 +02:00
commit 9d5fd281d6
2 changed files with 1 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -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" )

5
libraries/ZVulkan/src/glslang/glslang/Include/InfoSink.h
View file

@ -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(": ");