X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/66f063c3ea1b5495a5a608ae5e340f717bbde8fa..c0bc39e53c16a7e408b7bb0ecb13dc605f0b8ea4:/gdk/gdk.asd

diff --git a/gdk/gdk.asd b/gdk/gdk.asd
index 738234a..a3fabc8 100644
--- a/gdk/gdk.asd
+++ b/gdk/gdk.asd
@@ -5,24 +5,27 @@
 
 (in-package "GDK-SYSTEM")
 
-(pkg-exists-p "gtk+-2.0" :atleast-version "2.4.0")
-
-(when (string>= (pkg-version "gtk+-2.0") "2.6.0")
-  (pushnew :gtk2.6 *features*))
+(pkg-exists-p "gdk-2.0" :atleast-version "2.4.0" :error t)
 
 (defsystem gdk
-    :depends-on (glib pango)
+    :depends-on (gffi glib pango #?(pkg-exists-p "gdk-2.0" :atleast-version "2.8.0") cairo)
     :components ((:file "defpackage")
 		 (:library "libgdk_pixbuf-2.0" 
-			   :libdir #.(pkg-variable "gtk+-2.0" "libdir"))
-		 (:library "libgdk-x11-2.0" 
-			   :libdir #.(pkg-variable "gtk+-2.0" "libdir"))
-		 (:unix-dso "alien"
-			    :components ((:c-source-file "glue"
-					  :cflags #.(pkg-cflags "gtk+-2.0"))))
-		 (:file "gdktypes" :depends-on ("defpackage" "alien" 
+		  :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 "gdk-2.0")))
+		  :depends-on (#+cmu "libgdk-2.0"))
+		 (:file "gdktypes" :depends-on ("defpackage" "gdk-alien" 
 						"libgdk_pixbuf-2.0" 
-						"libgdk-x11-2.0"))
+						"libgdk-2.0"))
 		 (:file "gdkevents" :depends-on ("gdktypes"))
 		 (:file "pixbuf" :depends-on ("gdktypes"))
 		 (:file "gdk" :depends-on ("gdkevents"))