Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- git diff
- diff --git a/3rdparty/asio/include/asio/detail/impl/posix_event.ipp b/3rdparty/asio/include/asio/detail/impl/posix_event.ipp
- index a62c434..f713b64 100644
- --- a/3rdparty/asio/include/asio/detail/impl/posix_event.ipp
- +++ b/3rdparty/asio/include/asio/detail/impl/posix_event.ipp
- @@ -36,7 +36,11 @@ posix_event::posix_event()
- #else // (defined(__MACH__) && defined(__APPLE__))
- ::pthread_condattr_t attr;
- #else // (defined(__MACH__) && defined(__APPLE__))
- ::pthread_condattr_t attr;
- ::pthread_condattr_init(&attr);
- +#if !(defined(__ANDROID__) && defined(HAVE_PTHREAD_COND_TIMEDWAIT_MONOTONIC))
- int error = ::pthread_condattr_setclock(&attr, CLOCK_MONOTONIC);
- +#else
- + int error = 0;
- +#endif
- if (error == 0)
- error = ::pthread_cond_init(&cond_, &attr);
- #endif // (defined(__MACH__) && defined(__APPLE__))
- diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua
- index 7387a80..c95cf8b 100644
- --- a/scripts/toolchain.lua
- +++ b/scripts/toolchain.lua
- @@ -92,7 +92,8 @@ function toolchain(_buildDir, _subDir)
- location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION)
- - local androidPlatform = "android-21"
- +-- local androidPlatform = "android-21"
- + local androidPlatform = "android-19"
- if _OPTIONS["with-android"] then
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement