Various fixes to make the project build in Xcode 12 on Catalina
This now requires Boost to be installed by MacPorts. However, we could add the standard Homebrew path to the include path as well to support both. This also requires SFML and its dependencies to be installed in /Library/Frameworks; it's unclear whether this is reasonable. Code signing is completely disabled, and Zlib is now loaded as a tbd instead of a dylib. This will probably break for some older computers, but hopefully they can just use the Xcode 4 project instead. Boost is forcing -mt suffixes on all its libraries. Whatever. We'll just roll with that. This makes the script work both with and without the suffixes. Using parentheses instead of braces silences the stupid narrowing warning, so yay.
This commit is contained in:
@@ -154,7 +154,7 @@ void cControl::setFormat(eFormat prop, short val) {
|
||||
newVal = eFrameStyle(val);
|
||||
break;
|
||||
case TXT_COLOUR: // Interpret as a shade of grey
|
||||
newVal = sf::Color{val, val, val};
|
||||
newVal = sf::Color(val, val, val);
|
||||
break;
|
||||
}
|
||||
if(!manageFormat(prop, true, &newVal))
|
||||
|
Reference in New Issue
Block a user