teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

[Server] Temporarily disable CallFF for ARM

Browse source
This commit is contained in:
Koncord 2017-06-30 19:17:04 +08:00
parent f015c3b2f6
commit 15a197cb9a
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/openmw-mp/CMakeLists.txt
View file

@ -1,8 +1,10 @@
project(tes3mp-server) project(tes3mp-server)
if(UNIX) #temporarly disabled for non-unix if(UNIX) #temporarily disabled for non-unix
find_package(CallFF REQUIRED) if(NOT (${CMAKE_CXX_COMPILER} MATCHES "aarch64" OR ${CMAKE_CXX_COMPILER} MATCHES "arm")) #temporarily disabled for arm
include_directories(${CallFF_INCLUDES}) find_package(CallFF REQUIRED)
include_directories(${CallFF_INCLUDES})
endif(NOT (${CMAKE_CXX_COMPILER} MATCHES "aarch64" OR ${CMAKE_CXX_COMPILER} MATCHES "arm"))
endif(UNIX) endif(UNIX)
option(BUILD_WITH_PAWN "Enable Pawn language" OFF) option(BUILD_WITH_PAWN "Enable Pawn language" OFF)

6
apps/openmw-mp/Script/ScriptFunction.cpp
View file

@ -6,7 +6,7 @@
#include <stdexcept> #include <stdexcept>
#include "ScriptFunction.hpp" #include "ScriptFunction.hpp"
#ifndef _WIN32 // temporarily disabled #if !defined(_WIN32) && !defined(__arm__) // temporarily disabled
#include <call.hpp> #include <call.hpp>
#endif #endif
@ -155,11 +155,11 @@ boost::any ScriptFunction::Call(const vector<boost::any> &args)
throw runtime_error("C++ call: Unknown argument identifier " + *it); 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); Func f = reinterpret_cast<Func>(fCpp);
result = ::Call(f, callArgs); result = ::Call(f, callArgs);
#else #else
throw runtime_error("C++ call: Windows not supported yet.") throw runtime_error("C++ call: Windows and ARM not supported yet.")
#endif #endif
} }