X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/38c604ec4b161103576e1ecad95d67209da2967c..1d2032d45fc8c2603685f5f8f606c066b9418e6e:/gdk/gdk.asd

diff --git a/gdk/gdk.asd b/gdk/gdk.asd
index 2ff5130..849756c 100644
--- a/gdk/gdk.asd
+++ b/gdk/gdk.asd
@@ -1,31 +1,34 @@
 ;;; -*- Mode: lisp -*-
 
 (defpackage "GDK-SYSTEM"
-  (:use "COMMON-LISP" "ASDF" "PKG-CONFIG" "SHAREDLIB"))
+  (:use "COMMON-LISP" "ASDF" "PKG-CONFIG"))
 
 (in-package "GDK-SYSTEM")
 
-(pkg-exists-p "gtk+-2.0" :atleast-version "2.4.0")
-
-
-(load-shared-library "libgdk_pixbuf-2.0")
-(load-shared-library "libgdk-x11-2.0"
-		     :init "gdk_init"
-		     :prototype '(alien:function
-				  c-call:void
-				  alien:system-area-pointer
-				  alien:system-area-pointer)
-		     :initargs (list (system:int-sap 0) (system:int-sap 0)))
-
-
+(pkg-exists-p "gdk-2.0" :atleast-version "2.4.0" :error t)
 
 (defsystem gdk
-    :depends-on (glib)
+    :depends-on (gffi glib pango
+		 #?(pkg-exists-p "gdk-2.0" :atleast-version "2.14.0")gio 
+		 #?(pkg-exists-p "gdk-2.0" :atleast-version "2.8.0")cairo)
     :components ((:file "defpackage")
-		 (:unix-dso "alien"
+		 (:library "libgdk_pixbuf-2.0" 
+		  :libdir #.(pkg-libdir "gdk-2.0")
+		  :libname #-win32 "libgdk_pixbuf-2.0"
+		           #+win32 "libgdk_pixbuf-2.0-0")
+		 (:library "libgdk-2.0" 
+		  :libdir #.(pkg-libdir "gdk-2.0")
+		  :libname #-win32 "libgdk-x11-2.0"
+		           #+win32 "libgdk-win32-2.0-0")
+		 (:shared-object "gdk-alien" :pathname "alien/"
+		  :ldflags #.(pkg-libs "gdk-2.0")
 		  :components ((:c-source-file "glue"
-				:cflags #.(pkg-cflags "gtk+-2.0"))))
-		 (:file "gdktypes" :depends-on ("defpackage" "alien"))
+				:cflags #.(pkg-cflags "gdk-2.0")))
+		  :depends-on (#+cmu "libgdk-2.0"))
+		 (:file "gdktypes" :depends-on ("defpackage" "gdk-alien" 
+						"libgdk_pixbuf-2.0" 
+						"libgdk-2.0"))
 		 (:file "gdkevents" :depends-on ("gdktypes"))
+		 (:file "pixbuf" :depends-on ("gdktypes"))
 		 (:file "gdk" :depends-on ("gdkevents"))
-		 (:file "export" :depends-on ("gdkevents" "gdktypes" "gdk"))))
+		 (:file "export" :depends-on ("gdktypes" "gdkevents" "pixbuf" "gdk"))))