X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/22fc11dfa25fd7f21efec26285f93319b60e8260..a4aa29f96b7cf73765f3b9c672b6efadd9ec535e:/glib/glib.asd

diff --git a/glib/glib.asd b/glib/glib.asd
index 30c494e..d083773 100644
--- a/glib/glib.asd
+++ b/glib/glib.asd
@@ -20,27 +20,29 @@
     :components ((:file "defpackage")
 		 ;; For preloading to work in glib 2.6, the library needs to 
 		 ;; be configured and build with '--disable-visibility'
-  		 (:unix-dso "preload"
+  		 (:shared-object "glib-preload" :pathname "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"))
-		 (:unix-dso "alien"
-		  :components ((:c-source-file "callback"
-				:cflags #.(pkg-cflags "glib-2.0"))
-			       (:c-source-file "gobject" 
+		 (:library "libglib-2.0"
+		  :libdir #.(pkg-libdir "glib-2.0")
+		  :libname #-win32 "libglib-2.0"
+		           #+win32 "libglib-2.0-0"
+		  :depends-on ("glib-preload"))
+		 (:library "libgobject-2.0"
+		  :libdir #.(pkg-libdir "gobject-2.0")
+		  :libname #-win32 "libgobject-2.0"
+		           #+win32 "libgobject-2.0-0"
+		  :depends-on ("libglib-2.0"))
+		 (:shared-object "glib-alien" :pathname "alien/"
+		  :components ((:c-source-file "gobject" 
 				:cflags #.(pkg-cflags "glib-2.0")))
 		  :depends-on ("libgobject-2.0"))
 		 (:file "glib" :depends-on ("libglib-2.0" "defpackage"))
-		 (:file "gtype" :depends-on ("alien" "libgobject-2.0" "glib"))
+		 (:file "gtype" :depends-on ("glib-alien" "libgobject-2.0" "glib"))
 		 (:file "gboxed" :depends-on ("gtype"))
 		 (:file "genums" :depends-on ("gtype"))
 		 (:file "gparam" :depends-on ("genums"))
 		 (:file "gobject" :depends-on ("gparam"))
 		 (:file "ginterface" :depends-on ("gobject"))
-		 (:file "gcallback" :depends-on ("gtype" "gparam" "gobject" "alien"))
+		 (:file "gcallback" :depends-on ("gtype" "gparam" "gobject"))
 		 (:file "gerror" :depends-on ("gcallback"))))
\ No newline at end of file