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.

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

Mac OS X 10.5 compiler fixes #1523

Merged
merged 4 commits into from
Nov 8, 2023
Merged

Mac OS X 10.5 compiler fixes #1523

merged 4 commits into from
Nov 8, 2023

Conversation

dpogue
Copy link
Member

@dpogue dpogue commented Nov 5, 2023

This is not a full set of changes to make everything build on 10.5 PowerPC (because everything does not build on 10.5 PowerPC) but this is a hopefully uncontroversial set of small fixes.

CMakeLists.txt Outdated Show resolved Hide resolved
Sources/Plasma/CoreLib/CMakeLists.txt Show resolved Hide resolved
Sources/Plasma/PubUtilLib/plUnifiedTime/plUnifiedTime.cpp Outdated Show resolved Hide resolved
This is missing from older versions of Apple's OpenAL.framework headers.
We check if it's supported before trying to use it, but it does need to
be defined.
@dpogue dpogue force-pushed the osx-10.5-fixes branch 2 times, most recently from e8c60d5 to aebf1a9 Compare November 5, 2023 19:54
// but clock_gettime exists since macOS 10.12.
int res = clock_gettime(CLOCK_REALTIME, &ts);
hsAssert(res == 0, "clock_gettime failed");
# if defined(HAVE_BUILTIN_AVAILABLE) && MAC_OS_X_VERSION_MIN_REQUIRED >= 101500
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# if defined(HAVE_BUILTIN_AVAILABLE) && MAC_OS_X_VERSION_MIN_REQUIRED >= 101500
#if defined(HAVE_BUILTIN_AVAILABLE) && MAC_OS_X_VERSION_MIN_REQUIRED >= 101500

int res = timespec_get(&ts, TIME_UTC);
hsAssert(res != 0, "timespec_get failed");
} else
# endif
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# endif
#endif // defined(HAVE_BUILTIN_AVAILABLE) && MAC_OS_X_VERSION_MIN_REQUIRED >= 101500

dpogue and others added 2 commits November 5, 2023 16:19
Co-Authored-By: dgelessus <dgelessus@users.noreply.github.com>
The file was ifdef'ed out on non-Windows platforms, but it sometimes
causes linker warnings about the file having no symbols. Better to just
avoid compiling/linking it entirely on non-Windows platforms.
@Hoikas Hoikas merged commit 9a175fe into H-uru:master Nov 8, 2023
14 checks passed
@dpogue dpogue deleted the osx-10.5-fixes branch November 13, 2023 05:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants