Mercurial > hg > orthanc-stone

diff Resources/CMake/PixmanConfiguration.cmake @ 39:9ee7e2f5f1a3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
sync
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 21 Dec 2016 14:19:38 +0100
parents 22ab2d8566fa
children 28956ed68280
line wrap: on
line diff
--- a/Resources/CMake/PixmanConfiguration.cmake	Mon Dec 19 12:55:14 2016 +0100
+++ b/Resources/CMake/PixmanConfiguration.cmake	Wed Dec 21 14:19:38 2016 +0100
@@ -81,7 +81,23 @@
   endif()
 
 
-  if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+  ##########################
+  ## Portable Google NaCl
+  ##########################
+
+  if (CMAKE_SYSTEM_NAME STREQUAL "PNaCl")
+    # No hardware acceleration
+    set(PIXMAN_DEFINITIONS "${PIXMAN_DEFINITIONS};TLS=__thread")
+
+  elseif (CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
+    ##########################
+    ## Emscripten (asm.js)
+    ##########################
+
+    # No threading support
+    set(PIXMAN_DEFINITIONS "${PIXMAN_DEFINITIONS};PIXMAN_NO_TLS=1;HAVE_GCC_VECTOR_EXTENSIONS")
+
+  elseif (CMAKE_SYSTEM_NAME STREQUAL "Windows")
 
     ##########################
     ## Windows 32 or 64
@@ -183,14 +199,6 @@
       ${PIXMAN_SOURCES_DIR}/pixman/pixman-arm-simd.c
       )
 
-    ##########################
-    ## Portable Google NaCl
-    ##########################
-
-  elseif (CMAKE_SYSTEM_NAME STREQUAL "PNaCl")
-    # No hardware acceleration
-    set(PIXMAN_DEFINITIONS "${PIXMAN_DEFINITIONS};TLS=__thread")
-
   else()
     message(FATAL_ERROR "Support your platform here")
   endif()