Add some Android-related code

shmuz · Nov 23, 2024 · 86c04e0 · 86c04e0
1 parent 9af4c05
commit 86c04e0
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 8 deletions.
diff --git a/far/CMakeLists.txt b/far/CMakeLists.txt
@@ -233,6 +233,11 @@ set_target_properties(far2m
     PROPERTIES
     ENABLE_EXPORTS TRUE)
 
+if (DEFINED USELUA AND ${CMAKE_SYSTEM_NAME} MATCHES "Android")
+    target_include_directories(far2m PRIVATE ${LIBLUA_INCLUDE_DIR})
+    target_link_libraries(far2m PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/libluajit.a)
+endif()
+
 if (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
     target_link_libraries(far2m
 	PRIVATE ${WINPORT}

diff --git a/far/src/macro/macro.cpp b/far/src/macro/macro.cpp
@@ -33,6 +33,14 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "headers.hpp"
 
+#if defined(USELUA) && defined(__ANDROID__)
+extern "C" {
+#include <lua.h>
+#include <lauxlib.h>
+#include <lualib.h>
+}
+#endif
+
 #include "Bookmarks.hpp"
 #include "clipboard.hpp"
 #include "cmdline.hpp"
@@ -60,6 +68,14 @@ static long long msValues[constMsLAST];
 
 int Log(const char* Format, ...)
 {
+#if defined(USELUA) && defined(__ANDROID__)
+	if (lua_open == nullptr && luaL_openlibs == nullptr) //ensure libluajit.a linkage
+		return 0;
+	// lua_State *L = lua_open();
+	// luaL_openlibs(L);
+	// lua_close(L);
+#endif
+
 	va_list valist;
 	va_start(valist, Format);
 

diff --git a/far/src/plug/PluginW.cpp b/far/src/plug/PluginW.cpp
@@ -433,7 +433,11 @@ static const MacroPrivateInfo MacroInfo
 // This seems to prevent irregular segfaults related to unloading luafar.so in the process of Far termination.
 static BOOL LoadLuafar()
 {
-#ifdef USELUA
+#if !defined(USELUA)
+	return FALSE;
+#elif defined(__ANDROID__)
+	return TRUE;
+#else
 	// 1. Load Lua
 	const char *libs[] = {"libluajit-5.1.so", "liblua5.1.so", nullptr};
 	void *handle = nullptr;
@@ -463,9 +467,7 @@ static BOOL LoadLuafar()
 		Message(MSG_WARNING, 1, Msg::Error, L"Cannot load luafar.so", Msg::Ok);
 	}
 	return LuafarLoaded;
-#else
-	return FALSE;
-#endif // #ifdef USELUA
+#endif // #if defined(USELUA)
 }
 
 void CreatePluginStartupInfo(Plugin *pPlugin, PluginStartupInfo *PSI, FarStandardFunctions *FSF)

diff --git a/far/src/setattr.cpp b/far/src/setattr.cpp
@@ -62,6 +62,11 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "interf.hpp" // for BoxSymbols
 
+#if defined __ANDROID__ && __ANDROID_API__ < 26
+#define getpwent() (NULL)
+#define setpwent() ((void)0)
+#endif
+
 struct FSFileFlagsSafe : FSFileFlags
 {
 	FSFileFlagsSafe(const FARString &path, DWORD attrs)

diff --git a/hlfviewer/CMakeLists.txt b/hlfviewer/CMakeLists.txt
@@ -27,9 +27,17 @@ target_include_directories(${PROJECT_NAME} PRIVATE ../far/far2sdk)
 
 set(INSTALL_DIR "${INSTALL_DIR}/Plugins/luafar/${PROJECT_NAME}")
 
+if (${CMAKE_SYSTEM_NAME} MATCHES "Android")
+    target_link_libraries(${PROJECT_NAME} PUBLIC luafar)
+    set(LINK_FLAGS "-Wl,-rpath,../../")
+else()
+    set(LINK_FLAGS "")
+endif()
+
 set_target_properties(${PROJECT_NAME}
   PROPERTIES
     LIBRARY_OUTPUT_DIRECTORY "${INSTALL_DIR}/plug"
+    LINK_FLAGS "${LINK_FLAGS}"
     PREFIX ""
     SUFFIX ".far-plug-wide")
 

diff --git a/luafar/CMakeLists.txt b/luafar/CMakeLists.txt
@@ -15,6 +15,10 @@ add_custom_command(
     DEPENDS ${SDK}/farplug-wide.h ${SDK}/farcolor.h ${SDK}/farkeys.h ${MAKEFLAGS} ${FARSRC}/DlgGuid.hpp
 )
 
+if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Android")
+  set(MYTIMER_C src/mytimer.c)
+endif()
+
 set(SOURCES
   ${CMAKE_CURRENT_BINARY_DIR}/farflags.c
   src/bit64.c
@@ -23,7 +27,7 @@ set(SOURCES
   src/luamacro.c
   src/lusercontrol.c
   src/lutf8lib.c
-  src/mytimer.c
+  ${MYTIMER_C}
   src/service.c
   src/slnunico.c
   src/sysutils.c

diff --git a/luafar/src/service.c b/luafar/src/service.c
@@ -6277,7 +6277,7 @@ static int luaopen_far (lua_State *L)
 	lua_setfield(L, -2, "__index");
 	luaL_register(L, NULL, filefilter_methods);
 
-#if !defined(__FreeBSD__) && !defined(__DragonFly__)
+#if !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__ANDROID__)
 	lua_getglobal(L, "far");
 	lua_pushcfunction(L, luaopen_timer);
 	lua_call(L, 0, 1);

diff --git a/luamacro/CMakeLists.txt b/luamacro/CMakeLists.txt
@@ -31,12 +31,19 @@ target_include_directories(${PROJECT_NAME} PRIVATE ../far/far2sdk)
 
 set(INSTALL_DIR "${INSTALL_DIR}/Plugins/luafar/${PROJECT_NAME}")
 
+if (${CMAKE_SYSTEM_NAME} MATCHES "Android")
+    target_link_libraries(${PROJECT_NAME} PUBLIC luafar)
+    set(LINK_FLAGS "-Wl,-rpath,../../")
+else()
+    set(LINK_FLAGS "")
+endif()
+
 set_target_properties(${PROJECT_NAME}
   PROPERTIES
     LIBRARY_OUTPUT_DIRECTORY "${INSTALL_DIR}/plug"
+    LINK_FLAGS "${LINK_FLAGS}"
     PREFIX ""
-    SUFFIX ".far-plug-wide"
-)
+    SUFFIX ".far-plug-wide")
 
 function(Generate_Constants)
   set(TRG    "${INSTALL_DIR}/plug/constants.lua")