[cells-gtk-cvs] CVS update: root/gtk-ffi/gtk-ffi.lisp root/gtk-ffi/gtk-utilities.lisp

[Kenny Tilton]

Update of /project/cells-gtk/cvsroot/root/gtk-ffi
In directory common-lisp.net:/tmp/cvs-serv22788/gtk-ffi

Modified Files:
	gtk-ffi.lisp gtk-utilities.lisp 
Log Message:
Merge brave but incomplete attempt at adding OS/X.
Date: Thu Dec 23 17:34:52 2004
Author: ktilton

Index: root/gtk-ffi/gtk-ffi.lisp
diff -u root/gtk-ffi/gtk-ffi.lisp:1.7 root/gtk-ffi/gtk-ffi.lisp:1.8
--- root/gtk-ffi/gtk-ffi.lisp:1.7	Wed Dec 22 17:23:53 2004
+++ root/gtk-ffi/gtk-ffi.lisp	Thu Dec 23 17:34:51 2004
@@ -60,15 +60,29 @@
         (:gthread "libgthread-2.0-0.dll")
         (:gdk "libgdk-win32-2.0-0.dll")
         (:gtk "libgtk-win32-2.0-0.dll")))
-    #-(or win32 mswindows)
+    #+macosx
     (concatenate 'string
-      "/usr/lib"
+      "/sw/lib/"
       (ecase lib
-        (:gobject "libgobject-2.0.so")      
-        (:glib "libglib-2.0.so")
-        (:gthread "libgthread-2.0.so")
-        (:gdk "libgdk-x11-2.0.so")
-        (:gtk "libgtk-x11-2.0.so"))))
+        (:gobject "libgobject-2.0.0.dylib")
+        (:glib "libglib-2.0.0.dylib")
+        (:gthread "libgthread-2.0.0.dylib")
+        (:gdk "libgdk-x11-2.0.0.dylib")
+       (:gtk "libgtk-x11-2.0.0.dylib")))
+    #-(or macosx win32 mswindows)
+    (ecase lib
+      (:gobject "libgobject-2.0.so")      
+      (:glib "libglib-2.0.so")
+      (:gthread "libgthread-2.0.so")
+      (:gdk "libgdk-x11-2.0.so")
+      (:gtk "libgtk-x11-2.0.so")))
+  #+cmu
+  (loop for lib in '(:gthread :glib :gobject :gdk :gtk)
+     do (assert (uffi:load-foreign-library ;;simon
+		 (hic:find-foreign-library (gtk-ffi::libname lib) "/usr/lib/")
+		 :force-load #+lispworks t #-lispworks nil
+		 :module (string lib)))
+     )
   
   (defun ffi-to-uffi-type (clisp-type)
     #+clisp clisp-type


Index: root/gtk-ffi/gtk-utilities.lisp
diff -u root/gtk-ffi/gtk-utilities.lisp:1.5 root/gtk-ffi/gtk-utilities.lisp:1.6
--- root/gtk-ffi/gtk-utilities.lisp:1.5	Wed Dec 22 17:23:53 2004
+++ root/gtk-ffi/gtk-utilities.lisp	Thu Dec 23 17:34:51 2004
@@ -35,8 +35,8 @@
        (if after 1 0)))))
 
 (uffi:def-function ("g_signal_connect_data" g_signal_connect_data)
-    ((instance (* :void)) (detailed-signal :cstring)
-     (c-handler (* :void)) (data (* :void))(destroy-data (* :void)) (after :int))
+    ((instance :pointer-void) (detailed-signal :cstring)
+     (c-handler :pointer-void) (data :pointer-void)(destroy-data :pointer-void) (after :int))
   :returning :unsigned-long :call-direct nil)
 
 (defun wrap-func (func-address) ;; vestigial. func would never be nil. i think.