From 94f112dea3733f629c585cb9d6de3bd44da0e314 Mon Sep 17 00:00:00 2001 From: bjorn Date: Fri, 5 Apr 2019 00:38:26 -0700 Subject: [PATCH] Disable SSE on arm; Currently we turn off SSE based on the OS (Android or Emscripten), but this causes a build error on non-android arm CPUs. Now we correctly look at the CPU architecture. --- CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7bce983a..b1a73d79 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,7 +62,6 @@ if(EMSCRIPTEN) set(LOVR_USE_WEBVR ON) set(LOVR_USE_OPENVR OFF) set(LOVR_USE_OCULUS OFF) - set(LOVR_USE_SSE OFF) set(LOVR_ENABLE_THREAD OFF) elseif(ANDROID) set(LOVR_USE_OPENVR OFF) @@ -70,7 +69,6 @@ elseif(ANDROID) set(LOVR_USE_DESKTOP_HEADSET OFF) set(LOVR_USE_OCULUS_MOBILE ON) set(LOVR_USE_LUAJIT OFF) # Until buildvm re-invoke works - set(LOVR_USE_SSE OFF) # Assume ARM. Technically wrong on Android X86…? set(LOVR_BUILD_SHARED ON) # Android has only "activities" elseif(UNIX) if(APPLE) @@ -79,6 +77,10 @@ elseif(UNIX) find_package(PkgConfig) endif() +if(EMSCRIPTEN OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm") + set(LOVR_USE_SSE OFF) +endif() + # PhysicsFS if(LOVR_ENABLE_FILESYSTEM) if(LOVR_SYSTEM_PHYSFS)