mirror of
https://gitlab.com/eql/lqml.git
synced 2025-12-06 02:30:38 -08:00
revision: remove redundant #-interpreter, use #-ecl-bytecmp instead
This commit is contained in:
parent
d1c19ec74c
commit
878007b8f2
24 changed files with 16 additions and 28 deletions
|
|
@ -254,7 +254,7 @@
|
|||
Only useful if used with UNLESS, in order to check for a valid pointer.
|
||||
Returns T if the argument is not of type QT-OBJECT.
|
||||
|
||||
(unless (qnull ui:*item*)
|
||||
(unless (qnull (find-quick-item ui:*label*))
|
||||
...)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -70,7 +70,6 @@
|
|||
|
||||
#+mobile
|
||||
(progn
|
||||
(pushnew :interpreter *features*)
|
||||
(defvar *asdf-system* "app")
|
||||
(defvar *ql-libs* (cc *current* "ql-libs.lisp"))
|
||||
(defvar *init-name* "ini_app")
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ Rectangle {
|
|||
currentIndex: view.currentIndex
|
||||
}
|
||||
|
||||
Keys.onPressed: {
|
||||
Keys.onPressed: (event) => {
|
||||
if (event.key === Qt.Key_Back) {
|
||||
event.accepted = true
|
||||
if (view.currentIndex === 0) {
|
||||
|
|
|
|||
|
|
@ -13,8 +13,8 @@
|
|||
(unless (x:empty-string ip)
|
||||
(format nil "http://~A:8080/" ip))))
|
||||
|
||||
(defvar *remote-ip* #+interpreter nil
|
||||
#-interpreter #.(remote-ip))
|
||||
(defvar *remote-ip* #+ecl-bytecmp nil
|
||||
#-ecl-bytecmp #.(remote-ip))
|
||||
|
||||
(defun load* (file)
|
||||
(load (make-string-input-stream (curl (x:cc *remote-ip* file)))))
|
||||
|
|
|
|||
|
|
@ -81,7 +81,6 @@
|
|||
|
||||
#+mobile
|
||||
(progn
|
||||
(pushnew :interpreter *features*)
|
||||
(defvar *asdf-system* "app")
|
||||
(defvar *ql-libs* (cc *current* "ql-libs.lisp"))
|
||||
(defvar *init-name* "ini_app")
|
||||
|
|
|
|||
|
|
@ -46,7 +46,6 @@
|
|||
|
||||
#+mobile
|
||||
(progn
|
||||
(pushnew :interpreter *features*)
|
||||
(defvar *asdf-system* "app")
|
||||
(defvar *ql-libs* (cc *current* "ql-libs.lisp"))
|
||||
(defvar *init-name* "ini_app")
|
||||
|
|
|
|||
|
|
@ -67,7 +67,6 @@
|
|||
|
||||
#+mobile
|
||||
(progn
|
||||
(pushnew :interpreter *features*)
|
||||
(defvar *asdf-system* "app")
|
||||
(defvar *ql-libs* (cc *current* "ql-libs.lisp"))
|
||||
(defvar *init-name* "ini_app")
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@
|
|||
(unless (x:empty-string ip)
|
||||
(format nil "http://~A:8080/" ip))))
|
||||
|
||||
(defvar *remote-ip* #+interpreter nil
|
||||
#-interpreter #.(remote-ip))
|
||||
(defvar *remote-ip* #+ecl-bytecmp nil
|
||||
#-ecl-bytecmp #.(remote-ip))
|
||||
|
||||
(defun load* (file)
|
||||
(load (make-string-input-stream (curl (x:cc *remote-ip* file)))))
|
||||
|
|
|
|||
|
|
@ -52,7 +52,6 @@
|
|||
|
||||
#+mobile
|
||||
(progn
|
||||
(pushnew :interpreter *features*)
|
||||
(defvar *asdf-system* "lib")
|
||||
(defvar *ql-libs* (cc *current* "ql-libs.lisp"))
|
||||
(defvar *build-type* :fasl)
|
||||
|
|
|
|||
|
|
@ -92,7 +92,6 @@
|
|||
|
||||
#+mobile
|
||||
(progn
|
||||
(pushnew :interpreter *features*)
|
||||
(defvar *asdf-system* "app")
|
||||
(defvar *ql-libs* (cc *current* "ql-libs.lisp"))
|
||||
(defvar *init-name* "ini_app")
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ StackView {
|
|||
Lisp.call("editor:orientation-changed", Screen.orientation)
|
||||
}
|
||||
|
||||
Keys.onPressed: {
|
||||
Keys.onPressed: (event) => {
|
||||
if (event.key === Qt.Key_Back) {
|
||||
event.accepted = true
|
||||
Lisp.call("editor:back-pressed")
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
(defsystem :app
|
||||
:serial t
|
||||
;; requires this CLOG fork: https://gitlab.com/eql/clog-for-mobile/-/blob/main/clog-2.2.tgz
|
||||
:depends-on (#-clog-loaded :clog)
|
||||
:depends-on (#-depends-loaded :clog)
|
||||
:components ((:file "lisp/package")
|
||||
(:file "lisp/ini")
|
||||
(:file "lisp/ui-vars")
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
(in-package :qml)
|
||||
|
||||
#-interpreter
|
||||
#-ecl-bytecmp
|
||||
(ffi:clines "extern void init_lib_ASDF(cl_object);")
|
||||
|
||||
(defun %sym (symbol package)
|
||||
|
|
@ -12,6 +12,7 @@
|
|||
|
||||
(defun ensure-asdf ()
|
||||
(unless (find-package :asdf)
|
||||
#-ecl-bytecmp
|
||||
(ffi:c-inline nil nil :void "ecl_init_module(NULL, init_lib_ASDF)" :one-liner t)
|
||||
(in-package :qml-user))
|
||||
:asdf)
|
||||
|
|
|
|||
|
|
@ -84,7 +84,6 @@
|
|||
|
||||
#+mobile
|
||||
(progn
|
||||
(pushnew :interpreter *features*)
|
||||
(defvar *asdf-system* "app")
|
||||
(defvar *ql-libs* (cc *current* "ql-libs.lisp"))
|
||||
(defvar *init-name* "ini_app")
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ Rectangle {
|
|||
currentIndex: view.currentIndex
|
||||
}
|
||||
|
||||
Keys.onPressed: {
|
||||
Keys.onPressed: (event) => {
|
||||
if (event.key === Qt.Key_Back) {
|
||||
event.accepted = true
|
||||
if (view.currentIndex === 0) {
|
||||
|
|
|
|||
|
|
@ -10,8 +10,7 @@
|
|||
(push (merge-pathnames "./")
|
||||
asdf:*central-registry*)
|
||||
|
||||
(push :interpreter *features*)
|
||||
(push :clog-loaded *features*)
|
||||
(push :depends-loaded *features*)
|
||||
|
||||
(asdf:operate 'asdf:load-source-op :app)
|
||||
|
||||
|
|
|
|||
|
|
@ -85,7 +85,6 @@
|
|||
|
||||
#+mobile
|
||||
(progn
|
||||
(pushnew :interpreter *features*)
|
||||
(defvar *asdf-system* "app")
|
||||
(defvar *ql-libs* (cc *current* "ql-libs.lisp"))
|
||||
(defvar *init-name* "ini_app")
|
||||
|
|
|
|||
|
|
@ -63,7 +63,6 @@
|
|||
|
||||
#+mobile
|
||||
(progn
|
||||
(pushnew :interpreter *features*)
|
||||
(defvar *asdf-system* "app")
|
||||
(defvar *ql-libs* (cc *current* "ql-libs.lisp"))
|
||||
(defvar *init-name* "ini_app")
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@
|
|||
(unless (x:empty-string ip)
|
||||
(format nil "http://~A:8080/" ip))))
|
||||
|
||||
(defvar *remote-ip* #+interpreter nil
|
||||
#-interpreter #.(remote-ip))
|
||||
(defvar *remote-ip* #+ecl-bytecmp nil
|
||||
#-ecl-bytecmp #.(remote-ip))
|
||||
|
||||
(defun load* (file)
|
||||
(load (make-string-input-stream (curl (x:cc *remote-ip* file)))))
|
||||
|
|
|
|||
|
|
@ -81,7 +81,6 @@
|
|||
|
||||
#+mobile
|
||||
(progn
|
||||
(pushnew :interpreter *features*)
|
||||
(defvar *asdf-system* "app")
|
||||
(defvar *ql-libs* (cc *current* "ql-libs.lisp"))
|
||||
(defvar *init-name* "ini_app")
|
||||
|
|
|
|||
|
|
@ -38,7 +38,6 @@
|
|||
|
||||
#+mobile
|
||||
(progn
|
||||
(pushnew :interpreter *features*)
|
||||
(defvar *asdf-system* "app")
|
||||
(defvar *ql-libs* (cc *current* "ql-libs.lisp"))
|
||||
(defvar *init-name* "ini_app")
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@
|
|||
|
||||
(ext:install-c-compiler)
|
||||
|
||||
(setf *features* (remove :interpreter *features*))
|
||||
(setf *features* (remove :interpreter *features*)) ; now obsolete, see #-ecl-bytecmp
|
||||
|
||||
(load (merge-pathnames (format nil "platforms/~A/cross-compile"
|
||||
#+android "android"
|
||||
|
|
|
|||
|
|
@ -484,7 +484,7 @@ cl_object qnull(cl_object l_arg) {
|
|||
/// args: (qt-object)
|
||||
/// Only useful if used with UNLESS, in order to check for a valid pointer.
|
||||
/// Returns T if the argument is not of type QT-OBJECT.
|
||||
/// (unless (qnull ui:*item*)
|
||||
/// (unless (qnull (find-quick-item ui:*label*))
|
||||
/// ...)
|
||||
QObject* qobject = toQObjectPointer(l_arg);
|
||||
ecl_return1(ecl_process_env(), (qobject == nullptr) ? ECL_T : ECL_NIL);
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@
|
|||
|
||||
#+mobile
|
||||
(progn
|
||||
(pushnew :interpreter *features*)
|
||||
(defvar *asdf-system* "lqml")
|
||||
(defvar *init-name* "ini_LQML")
|
||||
(defvar *library-path* (format nil "platforms/~A/lib/"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue