X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/0811f929d0a3ddee2324a57487a3b961c48b0cf9..0aef7aaac0868dce7a5d3acc38824600943c235b:/glib/glib.asd

diff --git a/glib/glib.asd b/glib/glib.asd
index a12a37f..58ffaf7 100644
--- a/glib/glib.asd
+++ b/glib/glib.asd
@@ -23,16 +23,18 @@
   		 (:unix-dso "preload"
   		  :components ((:c-source-file "logging"
   				:cflags #.(pkg-cflags "glib-2.0"))))
-		 (:library "libglib-2.0" 
-			    :libdir #.(pkg-variable "glib-2.0" "libdir")
- 			    :depends-on ("preload"))
-		 (:library "libgobject-2.0" 
-			    :libdir #.(pkg-variable "glib-2.0" "libdir")
-			    :depends-on ("libglib-2.0"))
+		 (:library "libglib-2.0"
+			   :libdir #.(pkg-libdir "glib-2.0")
+			   :libname #-win32 "libglib-2.0"
+			            #+win32 "libglib-2.0-0"
+			   :depends-on ("preload"))
+		 (:library "libgobject-2.0"
+			   :libdir #.(pkg-libdir "glib-2.0")
+			   :libname #-win32 "libgobject-2.0"
+			            #+win32 "libgobject-2.0-0"
+			   :depends-on ("libglib-2.0"))
 		 (:unix-dso "alien"
-		  :components ((:c-source-file "callback"
-				:cflags #.(pkg-cflags "glib-2.0"))
-			       (:c-source-file "gobject" 
+		  :components ((:c-source-file "gobject" 
 				:cflags #.(pkg-cflags "glib-2.0")))
 		  :depends-on ("libgobject-2.0"))
 		 (:file "glib" :depends-on ("libglib-2.0" "defpackage"))
@@ -42,6 +44,5 @@
 		 (:file "gparam" :depends-on ("genums"))
 		 (:file "gobject" :depends-on ("gparam"))
 		 (:file "ginterface" :depends-on ("gobject"))
-		 (:file "gcallback" :depends-on ("gtype" "gparam" "gobject" "alien"))
-		 (:file "gerror" :depends-on ("gcallback"))
-		 (:file "export" :depends-on ("glib" "gboxed" "gtype" "gparam" "gcallback" "genums" "gobject" "gerror"))))
+		 (:file "gcallback" :depends-on ("gtype" "gparam" "gobject"))
+		 (:file "gerror" :depends-on ("gcallback"))))
\ No newline at end of file