[Scummvm-git-logs] scummvm master -> c7c7e2de49da700c09accbffbf1f030c62aa10e1
criezy
criezy at scummvm.org
Tue Feb 9 01:35:46 UTC 2021
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
3650aa6ce9 MACOSX: Stop using the -platform_version linker workaround for Retina displays
c7c7e2de49 Revert "MACOSX: Remove NSRequiresAquaSystemAppearance from Info.plist, for now"
Commit: 3650aa6ce96f2a28a9f8d3fb4ea9e74d1fd57832
https://github.com/scummvm/scummvm/commit/3650aa6ce96f2a28a9f8d3fb4ea9e74d1fd57832
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2021-02-09T01:35:40Z
Commit Message:
MACOSX: Stop using the -platform_version linker workaround for Retina displays
Commit a1d930209a6452649ab704dbbcf2084c9177936e is actually enough to
stop the blurry display issue on Retina screens (Bug #11430).
This reverts most of 70f79d3df8b4a9d4c6d1b69838ff5a722c51b61e.
Changed paths:
configure
devtools/create_project/xcode.cpp
diff --git a/configure b/configure
index 838c759b75..45ee9053bf 100755
--- a/configure
+++ b/configure
@@ -2902,9 +2902,6 @@ case $_host_os in
fi
fi
- # Building with SDK 10.14+ causes blurry display on Retina screens.
- # A workaround is to set the LC_VERSION_MIN_MACOSX load command's sdk value
- # to n/a (i.e. 0.0). See bug #11430 for details.
echocheck "macOS deployment target"
cat > $TMPC << EOF
#include "AvailabilityMacros.h"
@@ -2939,23 +2936,6 @@ EOF
fi
echo $_macos_min_version_dot
- # Building with SDK 10.14+ causes blurry display on Retina screens.
- # A workaround is to set the LC_VERSION_MIN_MACOSX load command's sdk value
- # to n/a (i.e. 0.0). See bug #11430 for details.
- # We do it in any case when the linker supports the -platform_version flag,
- # even when using an older SDK.
- echo_n "Checking if linker supports -platform_version... "
- _macos_has_ld_platform_version=no
- cat > $TMPC << EOF
-int main(int argc, char *argv[]) { return 0; }
-EOF
- _macos_ldflags_platform_version="-Xlinker -platform_version -Xlinker macos -Xlinker $_macos_min_version_dot -Xlinker 0.0.0"
- cc_check $_macos_ldflags_platform_version && _macos_has_ld_platform_version=yes
- echo $_macos_has_ld_platform_version
- if test "$_macos_has_ld_platform_version" = yes ; then
- append_var LDFLAGS "$_macos_ldflags_platform_version"
- fi
-
# Version-specific quirks
if test -n "$_macos_min_version" ; then
# When building for MacOS X 10.5 or below we need to use the legacy icon
diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index 79668ee74a..c400d246c0 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -30,11 +30,6 @@
#include <sstream>
#include <iomanip>
#include <CommonCrypto/CommonCrypto.h>
-
-// If we want to unset the sdk version in the executable to work around bug #11430
-// (blury display on retina screens when building with SDK 10.14+).
-// This workaround only works with Xcode 11+.
-//#define MACOSX_NO_SDKVERSION
#endif
namespace CreateProjectTool {
@@ -1160,19 +1155,6 @@ void XcodeProvider::setupBuildConfiguration(const BuildSetup &setup) {
ADD_SETTING_LIST(scummvmOSX_Debug, "LIBRARY_SEARCH_PATHS", scummvmOSX_LibPaths, kSettingsNoQuote | kSettingsAsList, 5);
ADD_SETTING_QUOTE(scummvmOSX_Debug, "OTHER_CFLAGS", "");
ADD_SETTING(scummvmOSX_Debug, "PRODUCT_NAME", PROJECT_NAME);
- ValueList scummvmOSX_LinkerFlags;
-#ifdef MACOSX_NO_SDKVERSION
- scummvmOSX_LinkerFlags.push_back("-Xlinker");
- scummvmOSX_LinkerFlags.push_back("-platform_version");
- scummvmOSX_LinkerFlags.push_back("-Xlinker");
- scummvmOSX_LinkerFlags.push_back("macos");
- scummvmOSX_LinkerFlags.push_back("-Xlinker");
- // Since the option can only be used with Xcode 11, assume the min version targetted is 10.14
- scummvmOSX_LinkerFlags.push_back("10.14");
- scummvmOSX_LinkerFlags.push_back("-Xlinker");
- scummvmOSX_LinkerFlags.push_back("0.0.0");
- ADD_SETTING_LIST(scummvmOSX_Debug, "OTHER_LDFLAGS", scummvmOSX_LinkerFlags, kSettingsAsList, 5);
-#endif
scummvmOSX_Debug_Object->addProperty("name", "Debug", "", kSettingsNoValue);
scummvmOSX_Debug_Object->_properties["buildSettings"] = scummvmOSX_Debug;
@@ -1187,9 +1169,6 @@ void XcodeProvider::setupBuildConfiguration(const BuildSetup &setup) {
ADD_SETTING(scummvmOSX_Release, "WRAPPER_EXTENSION", "app");
REMOVE_SETTING(scummvmOSX_Release, "DEBUG_INFORMATION_FORMAT");
ADD_SETTING_QUOTE(scummvmOSX_Release, "DEBUG_INFORMATION_FORMAT", "dwarf-with-dsym");
-#ifdef MACOSX_NO_SDKVERSION
- ADD_SETTING_LIST(scummvmOSX_Release, "OTHER_LDFLAGS", scummvmOSX_LinkerFlags, kSettingsAsList, 5);
-#endif
scummvmOSX_Release_Object->addProperty("name", "Release", "", kSettingsNoValue);
scummvmOSX_Release_Object->_properties["buildSettings"] = scummvmOSX_Release;
Commit: c7c7e2de49da700c09accbffbf1f030c62aa10e1
https://github.com/scummvm/scummvm/commit/c7c7e2de49da700c09accbffbf1f030c62aa10e1
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2021-02-09T01:35:40Z
Commit Message:
Revert "MACOSX: Remove NSRequiresAquaSystemAppearance from Info.plist, for now"
Since commit a1d930209a6452649ab704dbbcf2084c9177936e seems to be a
reliable way of avoiding any blurry display issue on Retina screens,
macOS Dark Mode can be enabled again.
This reverts commit c59bf95ba85b25b134110eb0ff9c3d0e17750630, and thus
restores commit 485e8bee17230ed8e17a27eaf148a3330f305a6f.
This fixes back bug #11305: Dark Mode is not supported.
Changed paths:
dists/macosx/Info.plist
dists/macosx/Info.plist.in
diff --git a/dists/macosx/Info.plist b/dists/macosx/Info.plist
index 7bba9817ac..d041203d32 100644
--- a/dists/macosx/Info.plist
+++ b/dists/macosx/Info.plist
@@ -72,6 +72,8 @@
<string>faYfM+DGPgJCrRzpxSHoFD0rzHa6ZnnEXuzz2E7ZRUk=</string>
<key>NSDockTilePlugIn</key>
<string>scummvm.docktileplugin</string>
+ <key>NSRequiresAquaSystemAppearance</key>
+ <false/>
<key>NSDocumentsFolderUsageDescription</key>
<string>ScummVM saves and loads savegames in the Documents folder by default.</string>
<key>SUPublicDSAKeyFile</key>
diff --git a/dists/macosx/Info.plist.in b/dists/macosx/Info.plist.in
index e872486afa..66c0072ec5 100644
--- a/dists/macosx/Info.plist.in
+++ b/dists/macosx/Info.plist.in
@@ -72,6 +72,8 @@
<string>faYfM+DGPgJCrRzpxSHoFD0rzHa6ZnnEXuzz2E7ZRUk=</string>
<key>NSDockTilePlugIn</key>
<string>scummvm.docktileplugin</string>
+ <key>NSRequiresAquaSystemAppearance</key>
+ <false/>
<key>NSDocumentsFolderUsageDescription</key>
<string>ScummVM saves and loads savegames in the Documents folder by default.</string>
<key>SUPublicDSAKeyFile</key>
More information about the Scummvm-git-logs
mailing list