thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MACOSX: Stop using the -platform_version linker workaround for Retina displays

Browse source 
Commit a1d930209a is actually enough to
stop the blurry display issue on Retina screens (Bug #11430).

This reverts most of 70f79d3df8.
This commit is contained in:
Donovan Watteau 2021-01-03 12:12:44 +01:00 • committed by Thierry Crozat
parent 66b75a59d6
commit 3650aa6ce9
2 changed files with 0 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

20
configure vendored
View file

@ -2902,9 +2902,6 @@ case $_host_os in
fi fi
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" echocheck "macOS deployment target"
cat > $TMPC << EOF cat > $TMPC << EOF
#include "AvailabilityMacros.h" #include "AvailabilityMacros.h"
@ -2939,23 +2936,6 @@ EOF
fi fi
echo $_macos_min_version_dot 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 # Version-specific quirks
if test -n "$_macos_min_version" ; then if test -n "$_macos_min_version" ; then
# When building for MacOS X 10.5 or below we need to use the legacy icon # When building for MacOS X 10.5 or below we need to use the legacy icon

21
devtools/create_project/xcode.cpp
View file

@ -30,11 +30,6 @@
#include <sstream> #include <sstream>
#include <iomanip> #include <iomanip>
#include <CommonCrypto/CommonCrypto.h> #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 #endif
namespace CreateProjectTool { 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_LIST(scummvmOSX_Debug, "LIBRARY_SEARCH_PATHS", scummvmOSX_LibPaths, kSettingsNoQuote | kSettingsAsList, 5);
ADD_SETTING_QUOTE(scummvmOSX_Debug, "OTHER_CFLAGS", ""); ADD_SETTING_QUOTE(scummvmOSX_Debug, "OTHER_CFLAGS", "");
ADD_SETTING(scummvmOSX_Debug, "PRODUCT_NAME", PROJECT_NAME); 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->addProperty("name", "Debug", "", kSettingsNoValue);
scummvmOSX_Debug_Object->_properties["buildSettings"] = scummvmOSX_Debug; scummvmOSX_Debug_Object->_properties["buildSettings"] = scummvmOSX_Debug;
@ -1187,9 +1169,6 @@ void XcodeProvider::setupBuildConfiguration(const BuildSetup &setup) {
ADD_SETTING(scummvmOSX_Release, "WRAPPER_EXTENSION", "app"); ADD_SETTING(scummvmOSX_Release, "WRAPPER_EXTENSION", "app");
REMOVE_SETTING(scummvmOSX_Release, "DEBUG_INFORMATION_FORMAT"); REMOVE_SETTING(scummvmOSX_Release, "DEBUG_INFORMATION_FORMAT");
ADD_SETTING_QUOTE(scummvmOSX_Release, "DEBUG_INFORMATION_FORMAT", "dwarf-with-dsym"); 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->addProperty("name", "Release", "", kSettingsNoValue);
scummvmOSX_Release_Object->_properties["buildSettings"] = scummvmOSX_Release; scummvmOSX_Release_Object->_properties["buildSettings"] = scummvmOSX_Release;