@@ -1,9 +1,8 @@

 CL=sbcl

-dylib: nsrect-expose.m

-	clang -arch x86_64 -arch arm64 -shared -framework Cocoa nsrect-expose.m -o libnsrect-expose.dylib

+all: mkapp

-demo-app: dylib

+demo-app:

 	$(CL) --load ~/quicklisp/setup.lisp \

 		    --eval '(ql:quickload :data-lens)' \

 		   --load save.lisp

@@ -26,11 +25,10 @@ demo-app.iconset: demo-app.svg

 	zsh convert.sh demo-app.svg 1024 demo-app.iconset/icon_1024x1024.png

 	zsh convert.sh demo-app.svg 2048 demo-app.iconset/icon_1024x1024@2x.png

-mkapp: dylib demo-app demo-app.iconset

+mkapp: demo-app demo-app.iconset

 	rm -rf demo.app

 	cp -R demo.app.template demo.app

 	mkdir -p demo.app/Contents/{Resources,MacOS,Frameworks}

 	iconutil -c icns demo-app.iconset -o demo.app/Contents/Resources/demo-app.icns

 	ibtool --compile demo.app/Contents/Resources/MainMenu.nib MainMenu.xib

 	cp demo-app demo.app/Contents/MacOS

-	cp libnsrect-expose.dylib demo.app/Contents/MacOS

@@ -39,6 +39,7 @@

     :void

   (rect (:struct objc-runtime:ns-rect)))

+#+(or)

 (cffi:defcfun (set-uncaught-exception-handler "set_uncaught_exception_handler"

                                               :library objc-runtime::expose-stuff)

     :void

@@ -1,31 +1,30 @@

 ;;; -*- Mode:Lisp; Syntax:ANSI-Common-Lisp; Package: ASDF-USER -*-

 (in-package :asdf-user)

-(defsystem :objc-runtime 

-    :description ""

-    :author "Ed L <edward@elangley.org>"

-    :license "MIT"

-    :depends-on (#:alexandria

-                 #:cffi

-                 #:cffi-libffi

-                 #:cffi-libffi

-                 #:data-lens

-                 #:fset

-                 #:fwoar-lisputils

-                 #:serapeum

-                 #:trivial-features

-                 #:trivial-main-thread

-                 #:uiop)

-    :defsystem-depends-on (#:cffi-grovel

-                           #:cffi-libffi)

-    :components ((:file "package")

-                 (:cffi-grovel-file "objc-runtime-types" :depends-on ("package" "readtable"))

-                 (:file "bundle-utils" :depends-on ("package"))

-                 (:file "readtable" :depends-on ("package"))

-                 (:file "gcd" :depends-on ("objc-runtime"))

-                 (:file "objc-runtime" :depends-on ("package" "readtable" "objc-runtime-types"))

-                 (:file "objc-data-extractors" :depends-on ("objc-runtime" "readtable"))

-                 (:file "manipulators" :depends-on ("objc-data-extractors" "readtable" "objc-runtime"))))

+(defsystem :objc-runtime

+  :description "A simple bridge to the objective-c runtime"

+  :author "Ed L <edward@elangley.org>"

+  :license "MIT"

+  :depends-on (#:alexandria

+               #:cffi

+               #:cffi-libffi

+               #:data-lens

+               #:fset

+               #:fwoar-lisputils

+               #:serapeum

+               #:trivial-features

+               #:trivial-main-thread

+               #:uiop)

+  :defsystem-depends-on (#:cffi-grovel

+                         #:cffi-libffi)

+  :components ((:file "package")

+               (:cffi-grovel-file "objc-runtime-types" :depends-on ("package" "readtable"))

+               (:file "bundle-utils" :depends-on ("package"))

+               (:file "readtable" :depends-on ("package"))

+               (:file "gcd" :depends-on ("objc-runtime"))

+               (:file "objc-runtime" :depends-on ("package" "readtable" "objc-runtime-types"))

+               (:file "objc-data-extractors" :depends-on ("objc-runtime" "readtable"))

+               (:file "manipulators" :depends-on ("objc-data-extractors" "readtable" "objc-runtime"))))

 (defsystem :objc-runtime/scripting-bridge

   :description ""