Add support for building Android x86 and x86_64

Author: gilzoide

Makefile

@@ -24,7 +24,7 @@ BUILT_OBJS = $(addprefix build/%/,$(OBJS))
 MAKE_LUAJIT_OUTPUT = build/%/luajit/src/luajit build/%/luajit/src/lua51.dll build/%/luajit/src/libluajit.a
 
 GDNLIB_ENTRY_PREFIX = addons/godot-lua-pluginscript
-BUILD_FOLDERS = build build/windows_x86 build/windows_x86_64 build/linux_x86 build/linux_x86_64 build/osx_x86_64 build/osx_arm64 build/osx_universal64 build/android_armv7a build/android_aarch64 build/$(GDNLIB_ENTRY_PREFIX)
+BUILD_FOLDERS = build build/windows_x86 build/windows_x86_64 build/linux_x86 build/linux_x86_64 build/osx_x86_64 build/osx_arm64 build/osx_universal64 build/android_armv7a build/android_aarch64 build/android_x86 build/android_x86_64 build/$(GDNLIB_ENTRY_PREFIX)
 
 DIST_SRC = LICENSE
 DIST_ADDONS_SRC = LICENSE lps_coroutine.lua lua_pluginscript.gdnlib $(wildcard build/*/lua*.*) $(wildcard plugin/*)
@@ -180,3 +180,13 @@ android-aarch64: _CC = "$(NDK_TOOLCHAIN_BIN)/aarch64-linux-android$(NDK_TARGET_A
 android-aarch64: MAKE_LUAJIT_ARGS += HOST_CC="$(CC) -fPIC" CROSS="$(NDK_TOOLCHAIN_BIN)/aarch64-linux-android-" STATIC_CC="$(_CC)" DYNAMIC_CC="$(_CC)" TARGET_LD="$(_CC)"
 android-aarch64: build/android_aarch64/liblua_pluginscript.so
 
+android-x86: NDK_TARGET_API ?= 16
+android-x86: _CC = "$(NDK_TOOLCHAIN_BIN)/i686-linux-android$(NDK_TARGET_API)-clang" -fPIC
+android-x86: MAKE_LUAJIT_ARGS += HOST_CC="$(CC) -m32 -fPIC" CROSS="$(NDK_TOOLCHAIN_BIN)/i686-linux-android-" STATIC_CC="$(_CC)" DYNAMIC_CC="$(_CC)" TARGET_LD="$(_CC)"
+android-x86: build/android_x86/liblua_pluginscript.so
+
+android-x86_64: NDK_TARGET_API ?= 21
+android-x86_64: _CC = "$(NDK_TOOLCHAIN_BIN)/x86_64-linux-android$(NDK_TARGET_API)-clang" -fPIC
+android-x86_64: MAKE_LUAJIT_ARGS += HOST_CC="$(CC) -fPIC" CROSS="$(NDK_TOOLCHAIN_BIN)/x86_64-linux-android-" STATIC_CC="$(_CC)" DYNAMIC_CC="$(_CC)" TARGET_LD="$(_CC)"
+android-x86_64: build/android_x86_64/liblua_pluginscript.so
+

README.md

@@ -196,9 +196,16 @@ make windows64  # x86_64
 make windows32  # x86
 make linux64    # x86_64
 make linux32    # x86
-make osx64 MACOSX_DEPLOYMENT_TARGET=XX.YY     # "universal" multiarch x86_64 + amd64 dylib
-make android-armv7a NDK_TOOLCHAIN_BIN=/path/to/ndk/toolchains/llvm/prebuild/host_os-arch/bin    # Android ARMv7
-make android-aarch64 NDK_TOOLCHAIN_BIN=/path/to/ndk/toolchains/llvm/prebuild/host_os-arch/bin   # Android ARM64
+make osx64 \    # "universal" multiarch x86_64 + amd64 dylib
+    MACOSX_DEPLOYMENT_TARGET=XX.YY
+make android-armv7a \   # Android ARMv7
+    NDK_TOOLCHAIN_BIN=/path/to/ndk/toolchains/llvm/prebuild/host_os-arch/bin   
+make android-aarch64 \  # Android ARM64
+    NDK_TOOLCHAIN_BIN=/path/to/ndk/toolchains/llvm/prebuild/host_os-arch/bin  
+make android-x86 \      # Android x86
+    NDK_TOOLCHAIN_BIN=/path/to/ndk/toolchains/llvm/prebuild/host_os-arch/bin      
+make android-x86_64 \   # Android x86_64
+    NDK_TOOLCHAIN_BIN=/path/to/ndk/toolchains/llvm/prebuild/host_os-arch/bin   
 ```
 
 The GDNativeLibrary file `lua_pluginscript.gdnlib` is already configured to use

lua_pluginscript.gdnlib

@@ -9,6 +9,8 @@ reloadable=false
 
 Android.armeabi-v7a="res://addons/godot-lua-pluginscript/build/android_armv7a/liblua_pluginscript.so"
 Android.arm64-v8a="res://addons/godot-lua-pluginscript/build/android_aarch64/liblua_pluginscript.so"
+Android.x86="res://addons/godot-lua-pluginscript/build/android_x86/liblua_pluginscript.so"
+Android.x86_64="res://addons/godot-lua-pluginscript/build/android_x86_64/liblua_pluginscript.so"
 OSX.64="res://addons/godot-lua-pluginscript/build/osx_universal64/lua_pluginscript.dylib"
 Windows.64="res://addons/godot-lua-pluginscript/build/windows_x86_64/lua_pluginscript.dll"
 Windows.32="res://addons/godot-lua-pluginscript/build/windows_x86/lua_pluginscript.dll"
@@ -19,6 +21,8 @@ X11.32="res://addons/godot-lua-pluginscript/build/linux_x86/liblua_pluginscript.
 
 Android.armeabi-v7a=[  ]
 Android.arm64-v8a=[  ]
+Android.x86=[  ]
+Android.x86_64=[  ]
 OSX.64=[  ]
 Windows.64=[ "res://addons/godot-lua-pluginscript/build/windows_x86_64/lua51.dll" ]
 Windows.32=[ "res://addons/godot-lua-pluginscript/build/windows_x86/lua51.dll" ]