Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MACOSX: simplify Retina blurriness workarounds and restore Dark Mode #2714

Merged
merged 2 commits into from Feb 9, 2021
Merged

MACOSX: simplify Retina blurriness workarounds and restore Dark Mode #2714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77bd90d
MACOSX: Stop using the -platform_version linker workaround for Retina…
dwatteau Jan 3, 2021
80ab653
Revert "MACOSX: Remove NSRequiresAquaSystemAppearance from Info.plist…
dwatteau Jan 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 0 additions & 20 deletions configure
View file
Open in desktop
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
21 changes: 0 additions & 21 deletions devtools/create_project/xcode.cpp
View file
Open in desktop
Expand Up @@ -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 {
Expand Down Expand Up @@ -1162,19 +1157,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;
Expand All @@ -1189,9 +1171,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;
Expand Down
2 changes: 2 additions & 0 deletions dists/macosx/Info.plist
View file
Open in desktop
Expand Up @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions dists/macosx/Info.plist.in
View file
Open in desktop
Expand Up @@ -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>
Expand Down