mirrors/lqml
1
Fork 0
mirror of https://gitlab.com/eql/lqml.git synced 2026-01-06 01:02:10 -08:00
Code Issues Projects Releases Packages Wiki Activity

fixes to examples 'swank-server', 'advanced-qml-auto-reload'

Browse source
This commit is contained in:
pls.153 2022-03-15 12:30:12 +01:00
parent 5cb6ac8384
commit 50de0b4833
6 changed files with 36 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

8
examples/advanced-qml-auto-reload/app.pro
View file

@ -19,9 +19,13 @@ PRE_TARGETDEPS += tmp/libapp.a
QT += quick qml QT += quick qml
TEMPLATE = app TEMPLATE = app
CONFIG += no_keywords release CONFIG += no_keywords release
DEFINES += INI_LISP DEFINES += INI_LISP INI_ECL_CONTRIB
INCLUDEPATH = /usr/local/include 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 -lecl
LIBS += -L/usr/local/lib/$$ECL_VERSION
LIBS += -lecl-help -ldeflate -lecl-cdb -lecl-curl -lql-minitar -lsockets
DESTDIR = . DESTDIR = .
TARGET = app TARGET = app
OBJECTS_DIR = tmp OBJECTS_DIR = tmp
@ -31,7 +35,6 @@ linux: LIBS += -L../../../platforms/linux/lib
macx: LIBS += -L../../../platforms/macos/lib macx: LIBS += -L../../../platforms/macos/lib
android { android {
DEFINES += INI_ECL_CONTRIB
QT += androidextras QT += androidextras
INCLUDEPATH = $$(ECL_ANDROID)/include INCLUDEPATH = $$(ECL_ANDROID)/include
ECL_VERSION = $$lower($$system($ECL_ANDROID/../ecl-android-host/bin/ecl -v)) ECL_VERSION = $$lower($$system($ECL_ANDROID/../ecl-android-host/bin/ecl -v))
@ -47,7 +50,6 @@ android {
} }
ios { ios {
DEFINES += INI_ECL_CONTRIB
INCLUDEPATH = $$(ECL_IOS)/include INCLUDEPATH = $$(ECL_IOS)/include
ECL_VERSION = $$lower($$system($ECL_IOS/../ecl-ios-host/bin/ecl -v)) ECL_VERSION = $$lower($$system($ECL_IOS/../ecl-ios-host/bin/ecl -v))
ECL_VERSION = $$replace(ECL_VERSION, " ", "-") ECL_VERSION = $$replace(ECL_VERSION, " ", "-")

3
examples/advanced-qml-auto-reload/lisp/curl.lisp
View file

@ -1,5 +1,8 @@
(in-package :qml) (in-package :qml)
#-(or android ios)
(require :ecl-curl)
(defun curl (url) (defun curl (url)
"args: (url) "args: (url)
Trivial download of UTF-8 encoded files, or binary files." Trivial download of UTF-8 encoded files, or binary files."

18
examples/advanced-qml-auto-reload/make.lisp
View file

@ -63,16 +63,17 @@
(length (namestring *default-pathname-defaults*)) (length (namestring *default-pathname-defaults*))
(1+ (position #\/ name :from-end t))))) (1+ (position #\/ name :from-end t)))))
;; load all LQML symbols (dolist (file (list "package" "x" "ecl-ext" "ini" "qml")) ; load LQML symbols
(dolist (file (list "package" "x" "ecl-ext" "ini" "qml"))
(load (merge-pathnames file "src/lisp/"))) (load (merge-pathnames file "src/lisp/")))
#-(or android ios) #-(or android ios)
(asdf:make-build "app" (progn
:monolithic t (require :ecl-curl)
:type :static-library (asdf:make-build "app"
:move-here (cc *current* "build/tmp/") :monolithic t
:init-name "ini_app") :type :static-library
:move-here (cc *current* "build/tmp/")
:init-name "ini_app"))
#+(or android ios) #+(or android ios)
(progn (progn
@ -87,7 +88,8 @@
(defvar *require* (list :ecl-curl)) (defvar *require* (list :ecl-curl))
(load "platforms/shared/make")) (load "platforms/shared/make"))
;; rename lib ;;; rename lib
(let* ((from #-(or android ios) (cc *current* "build/tmp/app--all-systems.a") (let* ((from #-(or android ios) (cc *current* "build/tmp/app--all-systems.a")
#+(or android ios) (cc *library-path* "app--all-systems.a")) #+(or android ios) (cc *library-path* "app--all-systems.a"))
(to "libapp.a") (to "libapp.a")

8
examples/swank-server/app.pro
View file

@ -19,9 +19,13 @@ PRE_TARGETDEPS += tmp/libapp.a
QT += quick qml QT += quick qml
TEMPLATE = app TEMPLATE = app
CONFIG += no_keywords release CONFIG += no_keywords release
DEFINES += INI_LISP DEFINES += INI_LISP INI_ECL_CONTRIB
INCLUDEPATH = /usr/local/include 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 -lecl
LIBS += -L/usr/local/lib/$$ECL_VERSION
LIBS += -lecl-help -ldeflate -lecl-cdb -lecl-curl -lql-minitar -lsockets
DESTDIR = . DESTDIR = .
TARGET = app TARGET = app
OBJECTS_DIR = tmp OBJECTS_DIR = tmp
@ -31,7 +35,6 @@ linux: LIBS += -L../../../platforms/linux/lib
macx: LIBS += -L../../../platforms/macos/lib macx: LIBS += -L../../../platforms/macos/lib
android { android {
DEFINES += INI_ECL_CONTRIB
QT += androidextras QT += androidextras
INCLUDEPATH = $$(ECL_ANDROID)/include INCLUDEPATH = $$(ECL_ANDROID)/include
ECL_VERSION = $$lower($$system($ECL_ANDROID/../ecl-android-host/bin/ecl -v)) ECL_VERSION = $$lower($$system($ECL_ANDROID/../ecl-android-host/bin/ecl -v))
@ -47,7 +50,6 @@ android {
} }
ios { ios {
DEFINES += INI_ECL_CONTRIB
INCLUDEPATH = $$(ECL_IOS)/include INCLUDEPATH = $$(ECL_IOS)/include
ECL_VERSION = $$lower($$system($ECL_IOS/../ecl-ios-host/bin/ecl -v)) ECL_VERSION = $$lower($$system($ECL_IOS/../ecl-ios-host/bin/ecl -v))
ECL_VERSION = $$replace(ECL_VERSION, " ", "-") ECL_VERSION = $$replace(ECL_VERSION, " ", "-")

3
examples/swank-server/lisp/curl.lisp
View file

@ -1,5 +1,8 @@
(in-package :qml) (in-package :qml)
#-(or android ios)
(require :ecl-curl)
(defun curl (url) (defun curl (url)
"args: (url) "args: (url)
Trivial download of UTF-8 encoded files, or binary files." Trivial download of UTF-8 encoded files, or binary files."

18
examples/swank-server/make.lisp
View file

@ -63,16 +63,17 @@
(length (namestring *default-pathname-defaults*)) (length (namestring *default-pathname-defaults*))
(1+ (position #\/ name :from-end t))))) (1+ (position #\/ name :from-end t)))))
;; load all LQML symbols (dolist (file (list "package" "x" "ecl-ext" "ini" "qml")) ; load LQML symbols
(dolist (file (list "package" "x" "ecl-ext" "ini" "qml"))
(load (merge-pathnames file "src/lisp/"))) (load (merge-pathnames file "src/lisp/")))
#-(or android ios) #-(or android ios)
(asdf:make-build "app" (progn
:monolithic t (require :ecl-curl)
:type :static-library (asdf:make-build "app"
:move-here (cc *current* "build/tmp/") :monolithic t
:init-name "ini_app") :type :static-library
:move-here (cc *current* "build/tmp/")
:init-name "ini_app"))
#+(or android ios) #+(or android ios)
(progn (progn
@ -87,7 +88,8 @@
(defvar *require* (list :ecl-curl)) (defvar *require* (list :ecl-curl))
(load "platforms/shared/make")) (load "platforms/shared/make"))
;; rename lib ;;; rename lib
(let* ((from #-(or android ios) (cc *current* "build/tmp/app--all-systems.a") (let* ((from #-(or android ios) (cc *current* "build/tmp/app--all-systems.a")
#+(or android ios) (cc *library-path* "app--all-systems.a")) #+(or android ios) (cc *library-path* "app--all-systems.a"))
(to "libapp.a") (to "libapp.a")