diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-07-22 14:41:19 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-07-22 14:41:19 +0300 |
| commit | 7d4b1c014c9900af47005a529df50ece14249326 (patch) | |
| tree | b942868ac94a1cc4dc528420720dcade417f71d0 | |
| parent | 358b65198a8d17067eddc1bb02d6363000b3699b (diff) | |
SL-13082 Declare macOS SDK version to be 10.12 instead of 10.15
| -rwxr-xr-x | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | indra/newview/Info-SecondLife.plist | 2 |
3 files changed, 7 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 7bbbf6430a..fb6340f026 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -1462,6 +1462,7 @@ 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 0d204fd716..a17bf088cd 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1944,6 +1944,10 @@ 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 cfe9d991c5..4f09495f83 100644 --- a/indra/newview/Info-SecondLife.plist +++ b/indra/newview/Info-SecondLife.plist @@ -79,5 +79,7 @@ <string>${MACOSX_BUNDLE_NSPRINCIPAL_CLASS}</string> <key>NSMainNibFile</key> <string>${MACOSX_BUNDLE_NSMAIN_NIB_FILE}</string> + <key>NSHighResolutionCapable</key> + <true/> </dict> </plist> |