mirror of
https://gitlab.com/eql/lqml.git
synced 2025-12-06 02:30:38 -08:00
fixes to examples 'swank-server', 'advanced-qml-auto-reload'
This commit is contained in:
parent
5cb6ac8384
commit
50de0b4833
6 changed files with 36 additions and 22 deletions
|
|
@ -19,9 +19,13 @@ PRE_TARGETDEPS += tmp/libapp.a
|
|||
QT += quick qml
|
||||
TEMPLATE = app
|
||||
CONFIG += no_keywords release
|
||||
DEFINES += INI_LISP
|
||||
DEFINES += INI_LISP INI_ECL_CONTRIB
|
||||
INCLUDEPATH = /usr/local/include
|
||||
ECL_VERSION = $$lower($$system(ecl -v))
|
||||
ECL_VERSION = $$replace(ECL_VERSION, " ", "-")
|
||||
LIBS = -L/usr/local/lib -lecl
|
||||
LIBS += -L/usr/local/lib/$$ECL_VERSION
|
||||
LIBS += -lecl-help -ldeflate -lecl-cdb -lecl-curl -lql-minitar -lsockets
|
||||
DESTDIR = .
|
||||
TARGET = app
|
||||
OBJECTS_DIR = tmp
|
||||
|
|
@ -31,7 +35,6 @@ linux: LIBS += -L../../../platforms/linux/lib
|
|||
macx: LIBS += -L../../../platforms/macos/lib
|
||||
|
||||
android {
|
||||
DEFINES += INI_ECL_CONTRIB
|
||||
QT += androidextras
|
||||
INCLUDEPATH = $$(ECL_ANDROID)/include
|
||||
ECL_VERSION = $$lower($$system($ECL_ANDROID/../ecl-android-host/bin/ecl -v))
|
||||
|
|
@ -47,7 +50,6 @@ android {
|
|||
}
|
||||
|
||||
ios {
|
||||
DEFINES += INI_ECL_CONTRIB
|
||||
INCLUDEPATH = $$(ECL_IOS)/include
|
||||
ECL_VERSION = $$lower($$system($ECL_IOS/../ecl-ios-host/bin/ecl -v))
|
||||
ECL_VERSION = $$replace(ECL_VERSION, " ", "-")
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
(in-package :qml)
|
||||
|
||||
#-(or android ios)
|
||||
(require :ecl-curl)
|
||||
|
||||
(defun curl (url)
|
||||
"args: (url)
|
||||
Trivial download of UTF-8 encoded files, or binary files."
|
||||
|
|
|
|||
|
|
@ -63,16 +63,17 @@
|
|||
(length (namestring *default-pathname-defaults*))
|
||||
(1+ (position #\/ name :from-end t)))))
|
||||
|
||||
;; load all LQML symbols
|
||||
(dolist (file (list "package" "x" "ecl-ext" "ini" "qml"))
|
||||
(dolist (file (list "package" "x" "ecl-ext" "ini" "qml")) ; load LQML symbols
|
||||
(load (merge-pathnames file "src/lisp/")))
|
||||
|
||||
#-(or android ios)
|
||||
(asdf:make-build "app"
|
||||
:monolithic t
|
||||
:type :static-library
|
||||
:move-here (cc *current* "build/tmp/")
|
||||
:init-name "ini_app")
|
||||
(progn
|
||||
(require :ecl-curl)
|
||||
(asdf:make-build "app"
|
||||
:monolithic t
|
||||
:type :static-library
|
||||
:move-here (cc *current* "build/tmp/")
|
||||
:init-name "ini_app"))
|
||||
|
||||
#+(or android ios)
|
||||
(progn
|
||||
|
|
@ -87,7 +88,8 @@
|
|||
(defvar *require* (list :ecl-curl))
|
||||
(load "platforms/shared/make"))
|
||||
|
||||
;; rename lib
|
||||
;;; rename lib
|
||||
|
||||
(let* ((from #-(or android ios) (cc *current* "build/tmp/app--all-systems.a")
|
||||
#+(or android ios) (cc *library-path* "app--all-systems.a"))
|
||||
(to "libapp.a")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue