diff --git a/.gitignore b/.gitignore index a132a60..8c27968 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ TODO lqml _* *.a +*.eclrc *.fas* *.*history *.lib @@ -13,6 +14,7 @@ _* *.qm *.stash *.ts +*.version *~ *.~ #*.*# diff --git a/examples/cl-repl/app.pro b/examples/cl-repl/app.pro index b97efcd..3632a3a 100644 --- a/examples/cl-repl/app.pro +++ b/examples/cl-repl/app.pro @@ -64,7 +64,12 @@ android { LIBS += -lasdf -lecl-help -ldeflate -lecl-cdb -lecl-curl -lql-minitar -lsockets LIBS += -L../../../platforms/android/lib - ANDROID_EXTRA_LIBS += $$ECL/lib/libecl.so + ANDROID_EXTRA_LIBS += $$ECL/lib/libecl.so + + # optional, not included in LQML + #SSL_PATH = ../../../platforms/android/lib + #ANDROID_EXTRA_LIBS += $$SSL_PATH/libcrypto.so $$SSL_PATH/libssl.so + ANDROID_PACKAGE_SOURCE_DIR = ../platforms/android 32bit { diff --git a/examples/cl-repl/lisp/ini.lisp b/examples/cl-repl/lisp/ini.lisp index 21fb837..ce7af23 100644 --- a/examples/cl-repl/lisp/ini.lisp +++ b/examples/cl-repl/lisp/ini.lisp @@ -58,4 +58,12 @@ ;;; hacks -(asdf:defsystem :sb-bsd-sockets) ; needed for :sockets (linked as static lib) +;; needed for :sockets (linked as static lib) +(asdf:defsystem :sb-bsd-sockets) + +;; eventual ssl libs (not included in LQML) need to be loaded manually +#+android +(when (probe-file "libssl.so") + (ffi:load-foreign-library "libcrypto.so") + (ffi:load-foreign-library "libssl.so")) + diff --git a/src/cpp/main.cpp b/src/cpp/main.cpp index 741b93d..9b7fee7 100644 --- a/src/cpp/main.cpp +++ b/src/cpp/main.cpp @@ -134,23 +134,12 @@ int main(int argc, char* argv[]) { ecl_init_module(NULL, init_lib_ASDF); #endif -#ifdef INI_SSL - #ifdef Q_OS_ANDROID - // ssl libs need to be loaded manually - LQML::eval("(ffi:load-foreign-library \"libcrypto.so\")"); - LQML::eval("(ffi:load-foreign-library \"libssl.so\")"); - #endif - LQML::eval("(push :cl+ssl-foreign-libs-already-loaded *features*)"); -#endif - // load .eclrc if (arguments.contains("-norc")) { arguments.removeAll("-norc"); } else { #if (defined Q_OS_ANDROID) || (defined Q_OS_IOS) - // mobile: don't hang on startup - LQML::eval("(x:when-it (probe-file \"~/.eclrc\")" - " (ignore-errors (load x:it)))"); + // nothing #else #ifndef DESKTOP_APP LQML::eval("(x:when-it (probe-file \"~/.eclrc\")"