From 7e0c146946aa3ff7313cb455ff1e5203f4503dbe Mon Sep 17 00:00:00 2001 From: Miku AuahDark Date: Thu, 11 Feb 2021 20:19:38 +0800 Subject: [PATCH] Use prebuilt static library for LuaJIT when compiling for Android. Using Megasource for Android doesn't work yet but this is one step to make it possible. --- CMakeLists.txt | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index d1dad7ea..07eb8fda 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -316,7 +316,21 @@ if(MSVC AND NOT MEGA_ARM64) set(MEGA_LUAJIT_LIB ${CMAKE_BINARY_DIR}/bin/lua51.lib) set(MEGA_LUAJIT_DLL ${CMAKE_BINARY_DIR}/bin/lua51.dll) set(MEGA_LUAJIT_INCLUDE ${MEGA_LUAJIT_SOURCE_DIR}/src) +elseif(ANDROID) + # LuaJIT is prebuilt in Android + message(STATUS "-----------------------------------------------------") + message(STATUS "Configuring: LuaJIT ${MEGA_LUAJIT_VER}") + message(STATUS "-----------------------------------------------------") + set(MEGA_LUAJIT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libs/LuaJIT") + add_library(luajit IMPORTED STATIC) + set_target_properties(luajit PROPERTIES + IMPORTED_LOCATION ${MEGA_LUAJIT_DIR}/android/${ANDROID_ABI}/libluajit.a + INCLUDE_DIRECTORIES ${MEGA_LUAJIT_DIR}/src + ) + set(MEGA_LUAJIT_LIB ${MEGA_LUAJIT_DIR}/android/${ANDROID_ABI}/libluajit.a) + set(MEGA_LUAJIT_DLL) + set(MEGA_LUAJIT_INCLUDE ${MEGA_LUAJIT_DIR}/src) endif() set(MEGA_3P