mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-31 10:45:16 +01:00
Code Issues Releases Wiki Activity

Downgrade Mac build requirements of OpenRCT2 to macOS 10.13 (#12749)

Browse Source 
Keep targeting macOS 10.14 for libopenrct2 target. Replace deployment target with macOS 10.13 for other targets, including the OpenRCT2 bundle.

Explicitly type std::arrays, since Xcode refuses to use C++17 array deduction.

Co-authored-by: Aaron van Geffen <aaron@aaronweb.net>
This commit is contained in:
awiebe
2020-08-28 13:27:25 -07:00
committed by GitHub
parent 8321227c9d
commit b53c4b3625
3 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenRCT2.xcodeproj/project.pbxproj
View File

@@ -4498,6 +4498,7 @@
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_OBJC_WEAK = YES;
MACOSX_DEPLOYMENT_TARGET = 10.13;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
@@ -4506,6 +4507,7 @@
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_OBJC_WEAK = YES;
MACOSX_DEPLOYMENT_TARGET = 10.13;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
@@ -4559,7 +4561,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
LD_NO_PIE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.8;
MACOSX_DEPLOYMENT_TARGET = 10.13;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
@@ -4613,7 +4615,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
LD_NO_PIE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.8;
MACOSX_DEPLOYMENT_TARGET = 10.13;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx;
};
@@ -4659,7 +4661,7 @@
"$(inherited)",
"$(PROJECT_DIR)/libxc/lib",
);
MACOSX_DEPLOYMENT_TARGET = 10.14;
MACOSX_DEPLOYMENT_TARGET = 10.13;
PRODUCT_BUNDLE_IDENTIFIER = io.openrct2.OpenRCT2;
PRODUCT_NAME = "$(TARGET_NAME)";
};
@@ -4705,7 +4707,7 @@
"$(inherited)",
"$(PROJECT_DIR)/libxc/lib",
);
MACOSX_DEPLOYMENT_TARGET = 10.14;
MACOSX_DEPLOYMENT_TARGET = 10.13;
PRODUCT_BUNDLE_IDENTIFIER = io.openrct2.OpenRCT2;
PRODUCT_NAME = "$(TARGET_NAME)";
};
@@ -4827,7 +4829,7 @@
"$(inherited)",
"$(PROJECT_DIR)/libxc/lib",
);
MACOSX_DEPLOYMENT_TARGET = 10.14;
MACOSX_DEPLOYMENT_TARGET = 10.13;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
@@ -4862,7 +4864,7 @@
"$(inherited)",
"$(PROJECT_DIR)/libxc/lib",
);
MACOSX_DEPLOYMENT_TARGET = 10.14;
MACOSX_DEPLOYMENT_TARGET = 10.13;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;

1
distribution/changelog.txt
View File

@@ -8,6 +8,7 @@
- Fix: [#12737] Space Rings draw the same vehicle 4 times.
- Fix: [#12764] Rides don't start aged anymore.
- Fix: Incomplete loop collision box allowed overlapping track (original bug).
- Technical: The required version of macOS has been lowered to 10.13 (High Sierra).
0.3.0 (2020-08-15)
------------------------------------------------------------------------

20
src/openrct2-ui/interface/Window.cpp
View File

@@ -194,7 +194,7 @@ rct_window* window_create_auto_pos(
auto screenHeight = uiContext->GetHeight();
// Place window in an empty corner of the screen
const std::array cornerPositions = {
const std::array<ScreenCoordsXY, 4> cornerPositions = {
ScreenCoordsXY{ 0, 30 }, // topLeft
ScreenCoordsXY{ screenWidth - width, 30 }, // topRight
ScreenCoordsXY{ 0, screenHeight - 34 - height }, // bottomLeft
@@ -212,14 +212,14 @@ rct_window* window_create_auto_pos(
{
if (w->flags & WF_STICK_TO_BACK)
continue;
const std::array offsets = { ScreenCoordsXY{ w->width + 2, 0 },
ScreenCoordsXY{ -w->width - 2, 0 },
ScreenCoordsXY{ 0, w->height + 2 },
ScreenCoordsXY{ 0, -w->height - 2 },
ScreenCoordsXY{ w->width + 2, -w->height - 2 },
ScreenCoordsXY{ -w->width - 2, -w->height - 2 },
ScreenCoordsXY{ w->width + 2, w->height + 2 },
ScreenCoordsXY{ -w->width - 2, w->height + 2 } };
const std::array<ScreenCoordsXY, 8> offsets = { ScreenCoordsXY{ w->width + 2, 0 },
ScreenCoordsXY{ -w->width - 2, 0 },
ScreenCoordsXY{ 0, w->height + 2 },
ScreenCoordsXY{ 0, -w->height - 2 },
ScreenCoordsXY{ w->width + 2, -w->height - 2 },
ScreenCoordsXY{ -w->width - 2, -w->height - 2 },
ScreenCoordsXY{ w->width + 2, w->height + 2 },
ScreenCoordsXY{ -w->width - 2, w->height + 2 } };
for (const auto& offset : offsets)
{
auto screenPos = w->windowPos + offset;
@@ -236,7 +236,7 @@ rct_window* window_create_auto_pos(
continue;
// clang-format off
const std::array offsets = { ScreenCoordsXY{ w->width + 2, 0 },
const std::array<ScreenCoordsXY, 4> offsets = { ScreenCoordsXY{ w->width + 2, 0 },
ScreenCoordsXY{ -w->width - 2, 0 },
ScreenCoordsXY{ 0, w->height + 2 },
ScreenCoordsXY{ 0, -w->height - 2 } };