git.fiddlerwoaroof.com
Browse code

Fix Makefile, update instructions

Ed Langley authored on 09/01/2018 17:10:23
Showing 3 changed files
... ...
@@ -1,6 +1,6 @@
1 1
 CCL=ccl
2 2
 
3
-dylib: nsrect-expose.m libnsrect-expose.dylib
3
+dylib: nsrect-expose.m
4 4
 	clang -shared \
5 5
 			-framework Cocoa \
6 6
 			nsrect-expose.m \
... ...
@@ -32,10 +32,3 @@ mkapp: dylib demo-app demo-app.iconset
32 32
 	iconutil -c icns demo-app.iconset -o demo.app/Contents/Resources/demo-app.icns
33 33
 	ibtool --compile demo.app/Contents/Resources/MainMenu.nib MainMenu.xib
34 34
 	cp demo-app demo.app/Contents/MacOS
35
-
36
-run: dylib
37
-	$(CCL) --load ~/quicklisp/setup.lisp \
38
-			--eval '(load (compile-file "objc-runtime.asd"))' \
39
-			--eval '(ql:quickload :objc-runtime)' \
40
-			--eval '(load (compile-file "demo-app.lisp"))' \
41
-			--eval '(demo-app::main)'
... ...
@@ -19,7 +19,13 @@ lisp's ffi types.
19 19
 1. clone fwoar.lisputils from
20 20
    https://github.com/fiddlerwoaroof/fwoar.lisputils and put it
21 21
    somewhere quicklisp can find it (e.g. ~/quicklisp/local-projects)
22
-2. build + run the demo:
22
+
23
+2. Install rsvg-convert:
24
+#+BEGIN_SRC sh
25
+brew install librsvg
26
+#+END_SRC
27
+   
28
+3. build + run the demo:
23 29
    #+BEGIN_SRC sh
24 30
 make mkapp CCL=/path/to/ccl
25 31
 open demo.app
... ...
@@ -108,7 +108,7 @@
108 108
                      alloc init)
109 109
       (objc-runtime::class-add-method my-class do-magic (cffi:callback button-action)
110 110
                                       "v@:@")
111
-      (fw.lu:prog1-bind (result [[my-class alloc] init])
111
+      (let ((result [[my-class alloc] init]))
112 112
         [button set-target :pointer result]
113 113
         [button set-action :pointer do-magic]))))
114 114