From 15a197cb9a23ed0b2592c0061a752fb3ac91207d Mon Sep 17 00:00:00 2001
From: Koncord <stas5978@gmail.com>
Date: Fri, 30 Jun 2017 19:17:04 +0800
Subject: [PATCH] [Server] Temporarily disable CallFF for ARM

---
 apps/openmw-mp/CMakeLists.txt            | 8 +++++---
 apps/openmw-mp/Script/ScriptFunction.cpp | 6 +++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/apps/openmw-mp/CMakeLists.txt b/apps/openmw-mp/CMakeLists.txt
index a9ae8c05d..368443089 100644
--- a/apps/openmw-mp/CMakeLists.txt
+++ b/apps/openmw-mp/CMakeLists.txt
@@ -1,8 +1,10 @@
 project(tes3mp-server)
 
-if(UNIX) #temporarly disabled for non-unix
-find_package(CallFF REQUIRED)
-include_directories(${CallFF_INCLUDES})
+if(UNIX) #temporarily disabled for non-unix
+    if(NOT (${CMAKE_CXX_COMPILER} MATCHES "aarch64" OR ${CMAKE_CXX_COMPILER} MATCHES "arm"))  #temporarily disabled for arm
+    find_package(CallFF REQUIRED)
+    include_directories(${CallFF_INCLUDES})
+    endif(NOT (${CMAKE_CXX_COMPILER} MATCHES "aarch64" OR ${CMAKE_CXX_COMPILER} MATCHES "arm"))
 endif(UNIX)
 
 option(BUILD_WITH_PAWN "Enable Pawn language" OFF)
diff --git a/apps/openmw-mp/Script/ScriptFunction.cpp b/apps/openmw-mp/Script/ScriptFunction.cpp
index 4847ec840..b04435356 100644
--- a/apps/openmw-mp/Script/ScriptFunction.cpp
+++ b/apps/openmw-mp/Script/ScriptFunction.cpp
@@ -6,7 +6,7 @@
 #include <stdexcept>
 #include "ScriptFunction.hpp"
 
-#ifndef _WIN32 // temporarily disabled
+#if !defined(_WIN32) && !defined(__arm__) // temporarily disabled
 #include <call.hpp>
 #endif
 
@@ -155,11 +155,11 @@ boost::any ScriptFunction::Call(const vector<boost::any> &args)
                     throw runtime_error("C++ call: Unknown argument identifier " + *it);
             }
         }
-#ifndef _WIN32 // temporarily disabled
+#if !defined(_WIN32) && !defined(__arm__) // temporarily disabled
         Func f = reinterpret_cast<Func>(fCpp);
         result = ::Call(f, callArgs);
 #else
-        throw runtime_error("C++ call: Windows not supported yet.")
+        throw runtime_error("C++ call: Windows and ARM not supported yet.")
 #endif
     }