Windows build

honix · Mar 15, 2018 · fe0bb1e · fe0bb1e
1 parent 9d6da12
commit fe0bb1e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/lire.lisp b/lire.lisp
@@ -49,13 +49,18 @@
 (defparameter *lire* nil)
 (defparameter *lire-ui-thread* nil)
 
-(defun run-lire ()
+(defun run-lire (&key (threaded t))
   (format t "Running lire..~%")
   (setf *lire*
         (make-instance 'lire-window)
         *lire-ui-thread*
-        (bordeaux-threads:make-thread
-         (lambda () (glut:display-window *lire*))
-         :name "Lire-UI-thread")))
+        (if threaded
+            (bordeaux-threads:make-thread
+                (lambda () (glut:display-window *lire*))
+                :name "Lire-UI-thread")
+            (sb-thread:main-thread))) ; hmm-umm
+  (unless threaded (glut:display-window *lire*)))
 
 (run-lire)
+; (save-lisp)
+
diff --git a/utils.lisp b/utils.lisp
@@ -80,7 +80,7 @@
         (t (loop for a in l nconc (flatten a :test test)))))
 
 ;;;
-;;  Saving-lisp (not really working yet)
+;;  Saving-lisp
 ;;;
 
 (defun save-lisp ()
@@ -90,8 +90,9 @@
    (concatenate 'string
                 "builds/Lire-" (software-type) ".exe")
    :toplevel (lambda ()
-               (format nil "Image loaded.")
-               (run-lire))
+               (format t "Image loaded.~%")
+               (run-lire :threaded nil))
    :executable t
-   :application-type :gui))
+   ;:application-type :gui
+   ))