godotengine/godot-angle-static
1
0
Fork 0
mirror of https://github.com/godotengine/godot-angle-static.git synced 2026-01-03 14:09:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rename PLATFORM_IOS to PLATFORM_IOS_FAMILY

Browse Source 
The current define ANGLE_PLATFORM_IOS actually means
"iOS or tvOS or WatchOS or MacCatalyst".
The current define ANGLE_PLATFORM_WATCHOS means nothing.
The current define ANGLE_PLATFORM_APPLETV means nothing.

Replace PLATFORM_IOS and its uses with PLATFORM_IOS_FAMILY, so that
then PLATFORM_IOS can be reintroduced and others can be fixed.

Replace PLATFORM_IOS_SIMULATOR and its uses with
PLATFORM_IOS_FAMILY_SIMULATOR for consistency.

Use consistent `#if X` notation instead of `#if defined(X)`.

Bug: angleproject:8121
Change-Id: Ibe668c2ae9bb801d15e036fcf1dfd53f22c30787
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4404161
Reviewed-by: Dan Glastonbury <djg@apple.com>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Commit-Queue: Kimmo Kinnunen <kkinnunen@apple.com>
This commit is contained in:
Kimmo Kinnunen
2023-04-06 12:27:00 +03:00
committed by Angle LUCI CQ
parent c19b66f6f8
commit f507fe05cd
17 changed files with 42 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
util/OSWindow.cpp
View File

@@ -461,7 +461,7 @@ bool FindTestDataPath(const char *searchPath, char *dataPathOut, size_t maxDataP
const std::string searchPaths[] = {
AndroidWindow::GetExternalStorageDirectory(),
AndroidWindow::GetExternalStorageDirectory() + "/third_party/angle"};
#elif defined(ANGLE_PLATFORM_IOS)
#elif ANGLE_PLATFORM_IOS_FAMILY
const std::string searchPaths[] = {GetExecutableDirectory(),
GetExecutableDirectory() + "/third_party/angle"};
#else