Mercurial > hg > orthanc-stone
changeset 289:36ebe6ec8fe8 am-2
merged default into am-2
| author | am@osimis.io |
|---|---|
| date | Thu, 30 Aug 2018 16:56:08 +0200 |
| parents | 8c8da145fefa (current diff) 3a8bac805352 (diff) |
| children | 87376a645ee1 |
| files | |
| diffstat | 2 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/Resources/CMake/CairoConfiguration.cmake Thu Aug 30 16:52:40 2018 +0200 +++ b/Resources/CMake/CairoConfiguration.cmake Thu Aug 30 16:56:08 2018 +0200 @@ -212,7 +212,8 @@ # Disable vectorized instructions when targeting archicture-independent PNaCl set(CAIRO_DEFINITIONS "${CAIRO_DEFINITIONS};HAVE_STDINT_H=1;CAIRO_HAS_PTHREAD=1;HAVE_UINT64_T=1") - elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Emscripten") + elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Emscripten" OR + ${CMAKE_SYSTEM_NAME} STREQUAL "Android") # Disable vectorized instructions and threading if targeting asm.js set(CAIRO_DEFINITIONS "${CAIRO_DEFINITIONS};HAVE_STDINT_H=1;CAIRO_HAS_PTHREAD=0;CAIRO_NO_MUTEX=1;HAVE_UINT64_T=1")
--- a/Resources/CMake/PixmanConfiguration.cmake Thu Aug 30 16:52:40 2018 +0200 +++ b/Resources/CMake/PixmanConfiguration.cmake Thu Aug 30 16:56:08 2018 +0200 @@ -108,7 +108,8 @@ # No hardware acceleration set(PIXMAN_DEFINITIONS "${PIXMAN_DEFINITIONS};TLS=__thread") - elseif (CMAKE_SYSTEM_NAME STREQUAL "Emscripten") + elseif (CMAKE_SYSTEM_NAME STREQUAL "Emscripten" OR + CMAKE_SYSTEM_NAME STREQUAL "Android") ########################## ## Emscripten (asm.js) ########################## @@ -189,6 +190,7 @@ elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "armv5te" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "armv6" OR + CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7l" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7-a" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")