add 32bit support (android only)

This commit is contained in:
pls.153 2022-05-08 10:16:18 +02:00
parent 090482a7ec
commit df358fa5ae
15 changed files with 234 additions and 65 deletions

View file

@ -7,7 +7,7 @@
#include <QQuickView>
#include <QDebug>
const char LQML::version[] = "22.5.1"; // May 2022
const char LQML::version[] = "22.5.2"; // May 2022
extern "C" void ini_LQML(cl_object);

View file

@ -2,10 +2,15 @@ QT += quick qml
TEMPLATE = lib
CONFIG += c++17 staticlib no_keywords release
LIBS = -L/usr/local/lib -lecl
TARGET = lqml
OBJECTS_DIR = ./tmp
MOC_DIR = ./tmp
32bit {
TARGET = lqml32
} else {
TARGET = lqml
}
linux {
INCLUDEPATH = /usr/local/include
DESTDIR = ../../platforms/linux/lib
@ -23,11 +28,21 @@ win32 {
}
android {
32bit {
ECL = $$(ECL_ANDROID_32)
} else {
ECL = $$(ECL_ANDROID)
}
QT += androidextras
INCLUDEPATH = $$(ECL_ANDROID)/include
LIBS = -L$$(ECL_ANDROID)/lib -lecl
INCLUDEPATH = $$ECL/include
LIBS = -L$$ECL/lib -lecl
DESTDIR = ../../platforms/android/lib
ANDROID_ABIS = "arm64-v8a"
32bit {
ANDROID_ABIS = "armeabi-v7a"
} else {
ANDROID_ABIS = "arm64-v8a"
}
}
ios {
@ -55,7 +70,7 @@ SOURCES += \
# compile Lisp code
android {
QMAKE_POST_LINK = $$(ECL_ANDROID)/../ecl-android-host/bin/ecl \
QMAKE_POST_LINK = $$ECL/../ecl-android-host/bin/ecl \
-norc -shell $$PWD/make.lisp
} else:ios {
QMAKE_POST_LINK = ../../platforms/ios/cross-compile.sh ../make.lisp

View file

@ -52,7 +52,8 @@
#+msvc "lib"
#-msvc "a"))
(to #+msvc "lisp.lib"
#-msvc "liblisp.a")
#-msvc (format nil "liblisp~A.a"
(if (<= most-positive-fixnum (expt 2 32)) "32" "")))
(to* (format nil "platforms/~A/lib/~A"
#+(and linux (not android)) "linux"
#+(and darwin (not ios)) "macos"