revisions

examples/9999/make.lisp

@@ -45,9 +45,10 @@
   (defvar *asdf-system*   "app")
   (defvar *ql-libs*       (cc *current* "/ql-libs.lisp"))
   (defvar *init-name*     "ini_app")
-  (defvar *library-name*  (cc *current* (format nil "/build-~A/tmp/app"
-                                                #+android "android"
-                                                #+ios     "ios")))
+  (defvar *library-name*  (format nil "~A/build-~A/tmp/app"
+                                  *current*
+                                  #+android "android"
+                                  #+ios     "ios"))
   (defvar *epilogue-code* nil)
   (load "platforms/shared/make"))
 

src/cpp/lqml.cpp

@@ -1,5 +1,5 @@
 #include "lqml.h"
-#include "qml.h"
+#include "qml_ext.h"
 #include "ecl_ext.h"
 #include <iostream>
 #include <QCoreApplication>

src/cpp/qml_ext.cpp

@@ -1,4 +1,4 @@
-#include "qml.h"
+#include "qml_ext.h"
 #include "lqml.h"
 #include "ecl_fun.h"
 

src/cpp/qml_ext.h

@@ -1,5 +1,5 @@
-#ifndef QML_H
-#define QML_H
+#ifndef QML_EXT_H
+#define QML_EXT_H
 
 #include <QtQml>
 

src/lqml-lib.pro

@@ -32,16 +32,16 @@ ios {
 HEADERS += \
   cpp/marshal.h \
   cpp/ecl_ext.h \
+  cpp/qml_ext.h \
   cpp/lqml.h \
-  cpp/qml.h \
   cpp/qt_ecl.h \
   cpp/single_shot.h
 
 SOURCES += \
   cpp/marshal.cpp \
   cpp/ecl_ext.cpp \
+  cpp/qml_ext.cpp \
   cpp/lqml.cpp \
-  cpp/qml.cpp \
   cpp/qt_ecl.cpp \
   cpp/single_shot.cpp
 

src/lqml.pro

@@ -24,16 +24,16 @@ INSTALLS = target
 HEADERS += \
   cpp/marshal.h \
   cpp/ecl_ext.h \
+  cpp/qml_ext.h \
   cpp/lqml.h \
-  cpp/qml.h \
   cpp/qt_ecl.h \
   cpp/single_shot.h
 
 SOURCES += \
   cpp/marshal.cpp \
   cpp/ecl_ext.cpp \
+  cpp/qml_ext.cpp \
   cpp/lqml.cpp \
-  cpp/qml.cpp \
   cpp/qt_ecl.cpp \
   cpp/single_shot.cpp \
   cpp/main.cpp