From 77c629e0251cf5b5a65077ec6a0697555f7be70a Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Thu, 6 Aug 2020 15:23:12 +0300
Subject: [PATCH] Revert "SL-13082 Declare macOS SDK version to be 10.12
instead of 10.15"
This reverts commit 7d4b1c014c9900af47005a529df50ece14249326.
Until the TC mac build nodes update.
---
doc/contributions.txt | 1 -
indra/newview/CMakeLists.txt | 4 ----
indra/newview/Info-SecondLife.plist | 2 --
3 files changed, 7 deletions(-)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index fb6340f026d..7bbbf6430a5 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -1462,7 +1462,6 @@ Tonya Souther
BUG-3875
BUG-3968
OPEN-345
- SL-13082
Torben Trautman
TouchaHoney Perhaps
TraductoresAnonimos Alter
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index a17bf088cd7..0d204fd716d 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1944,10 +1944,6 @@ elseif (DARWIN)
set_target_properties(${VIEWER_BINARY_NAME}
PROPERTIES
LINK_FLAGS_RELEASE "${LINK_FLAGS_RELEASE} -Xlinker -dead_strip -Xlinker -map -Xlinker ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_BINARY_NAME}.MAP"
- # Force the SDK version in the linked executable to be 10.12. This will fool
- # macOS into using the pre-Mojave display system, avoiding the blurry display that
- # otherwise occurs when upscaling the viewer to Retina resolution levels.
- LINK_FLAGS_RELEASE "${LINK_FLAGS_RELEASE} -Xlinker -platform_version -Xlinker macos -Xlinker ${CMAKE_OSX_DEPLOYMENT_TARGET} -Xlinker 10.12"
)
else (WINDOWS)
# Linux
diff --git a/indra/newview/Info-SecondLife.plist b/indra/newview/Info-SecondLife.plist
index 4f09495f83a..cfe9d991c5a 100644
--- a/indra/newview/Info-SecondLife.plist
+++ b/indra/newview/Info-SecondLife.plist
@@ -79,7 +79,5 @@
<string>${MACOSX_BUNDLE_NSPRINCIPAL_CLASS}</string>
<key>NSMainNibFile</key>
<string>${MACOSX_BUNDLE_NSMAIN_NIB_FILE}</string>
- <key>NSHighResolutionCapable</key>
- <true/>
</dict>
</plist>
--
GitLab