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.

Sign up for GitHub

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

Jump to bottom

Fix compilation on newer android NDKs #4

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix compilation on newer android NDKs #4

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4da0956
Fix compilation on newer android NDKs
justin-espedal Sep 17, 2020
94ccc88
Re-add arm64 check
justin-espedal Sep 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion include/config-android.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
#define AL_API __attribute__((visibility("protected")))
#define ALC_API __attribute__((visibility("protected")))

#if defined __has_include
# if __has_include (<android/ndk-version.h>)
# include <android/ndk-version.h>
# endif
#endif

#ifdef IN_IDE_PARSER
/* KDevelop's parser doesn't recognize the C99-standard restrict keyword, but
* recent versions (at least 4.5.1) do recognize GCC's __restrict. */
Expand Down Expand Up @@ -99,7 +105,7 @@
#define HAVE_MODFF

/* Define if we have the log2f function */
#if defined(HXCPP_ARM64) || defined(HXCPP_CPP11) // Not supporting in Android NDK platform < 18, define when increasing platform
#if defined(HXCPP_ARM64) || __NDK_MAJOR__ > 18
#define HAVE_LOG2F
#else
/* undef HAVE_LOG2F */
Expand Down