Advertisement
Guest User

Untitled

a guest
Jan 19th, 2017
119
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.29 KB | None | 0 0
  1. git diff
  2. diff --git a/3rdparty/asio/include/asio/detail/impl/posix_event.ipp b/3rdparty/asio/include/asio/detail/impl/posix_event.ipp
  3. index a62c434..f713b64 100644
  4. --- a/3rdparty/asio/include/asio/detail/impl/posix_event.ipp
  5. +++ b/3rdparty/asio/include/asio/detail/impl/posix_event.ipp
  6. @@ -36,7 +36,11 @@ posix_event::posix_event()
  7. #else // (defined(__MACH__) && defined(__APPLE__))
  8. ::pthread_condattr_t attr;
  9. #else // (defined(__MACH__) && defined(__APPLE__))
  10. ::pthread_condattr_t attr;
  11. ::pthread_condattr_init(&attr);
  12. +#if !(defined(__ANDROID__) && defined(HAVE_PTHREAD_COND_TIMEDWAIT_MONOTONIC))
  13. int error = ::pthread_condattr_setclock(&attr, CLOCK_MONOTONIC);
  14. +#else
  15. + int error = 0;
  16. +#endif
  17. if (error == 0)
  18. error = ::pthread_cond_init(&cond_, &attr);
  19. #endif // (defined(__MACH__) && defined(__APPLE__))
  20. diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua
  21. index 7387a80..c95cf8b 100644
  22. --- a/scripts/toolchain.lua
  23. +++ b/scripts/toolchain.lua
  24. @@ -92,7 +92,8 @@ function toolchain(_buildDir, _subDir)
  25.  
  26. location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION)
  27.  
  28. - local androidPlatform = "android-21"
  29. +-- local androidPlatform = "android-21"
  30. + local androidPlatform = "android-19"
  31. if _OPTIONS["with-android"] then
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement