Skip to content

Commit

Permalink
Fixed compiler error on Linux with non-x86 64bit platforms, e.g. arm6…
Browse files Browse the repository at this point in the history
…4, mips, and s390x architectures

This modification is already applied in upstream angelscript repository:
https://sourceforge.net/p/angelscript/code/2353/

Thanks to Adrian Bunk and Andreas Jonsson
  • Loading branch information
deveee committed Oct 3, 2016
1 parent 21a0421 commit 5e05f11
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions lib/angelscript/projects/cmake/CMakeLists.txt
Expand Up @@ -67,6 +67,7 @@ set(ANGELSCRIPT_SOURCE
../../source/as_builder.cpp
../../source/as_bytecode.cpp
../../source/as_callfunc.cpp
../../source/as_callfunc_mips.cpp
../../source/as_callfunc_x86.cpp
../../source/as_callfunc_x64_gcc.cpp
../../source/as_callfunc_x64_msvc.cpp
Expand Down
2 changes: 1 addition & 1 deletion lib/angelscript/source/as_config.h
Expand Up @@ -844,7 +844,7 @@
#define THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
#define AS_X86
#undef AS_NO_THISCALL_FUNCTOR_METHOD
#elif defined(__LP64__) && !defined(__arm64__)
#elif defined(__x86_64__)
#define AS_X64_GCC
#undef AS_NO_THISCALL_FUNCTOR_METHOD
#define HAS_128_BIT_PRIMITIVES
Expand Down

0 comments on commit 5e05f11

Please sign in to comment.