~mdw
/
clg
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
1dfea3a
)
Defsystem cleanups
author
espen
<espen>
Tue, 5 Jun 2007 10:14:31 +0000
(10:14 +0000)
committer
espen
<espen>
Tue, 5 Jun 2007 10:14:31 +0000
(10:14 +0000)
gdk/gdk.asd
patch
|
blob
|
blame
|
history
gtk/gtk.asd
patch
|
blob
|
blame
|
history
diff --git
a/gdk/gdk.asd
b/gdk/gdk.asd
index
c70f896
..
a2d7f56
100644
(file)
--- a/
gdk/gdk.asd
+++ b/
gdk/gdk.asd
@@
-5,22
+5,25
@@
(in-package "GDK-SYSTEM")
(in-package "GDK-SYSTEM")
-(pkg-exists-p "g
tk+
-2.0" :atleast-version "2.4.0" :error t)
+(pkg-exists-p "g
dk
-2.0" :atleast-version "2.4.0" :error t)
(defsystem gdk
(defsystem gdk
- :depends-on (gffi glib pango #?(pkg-exists-p "g
tk+
-2.0" :atleast-version "2.8.0") cairo)
+ :depends-on (gffi glib pango #?(pkg-exists-p "g
dk
-2.0" :atleast-version "2.8.0") cairo)
:components ((:file "defpackage")
(:library "libgdk_pixbuf-2.0"
: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"))
+ :libdir #.(pkg-variable "gdk-2.0" "libdir"))
+ (:library "libgdk-2.0"
+ :libdir #.(pkg-variable "gdk-2.0" "libdir")
+ :libname #-win32 "libgdk-x11-2.0"
+ #+win32 "libgdk-win32-2.0-0")
(:unix-dso "alien"
(:unix-dso "alien"
- :ldflags #.(pkg-libs "g
tk+
-2.0")
+ :ldflags #.(pkg-libs "g
dk
-2.0")
:components ((:c-source-file "glue"
:components ((:c-source-file "glue"
- :cflags #.(pkg-cflags "gtk+-2.0"))))
+ :cflags #.(pkg-cflags "gdk-2.0")))
+ :depends-on (#+cmu "libgdk-2.0"))
(:file "gdktypes" :depends-on ("defpackage" "alien"
"libgdk_pixbuf-2.0"
(:file "gdktypes" :depends-on ("defpackage" "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"))
(:file "gdkevents" :depends-on ("gdktypes"))
(:file "pixbuf" :depends-on ("gdktypes"))
(:file "gdk" :depends-on ("gdkevents"))
diff --git
a/gtk/gtk.asd
b/gtk/gtk.asd
index
c2e15a7
..
e3b31a0
100644
(file)
--- a/
gtk/gtk.asd
+++ b/
gtk/gtk.asd
@@
-12,16
+12,17
@@
(defsystem gtk
:depends-on (gffi glib gdk pango atk)
:components ((:file "defpackage")
(defsystem gtk
:depends-on (gffi glib gdk pango atk)
:components ((:file "defpackage")
- (:library "libgtk-x11-2.0"
- :libdir #.(pkg-variable "gtk+-2.0" "libdir"))
+ (:library "libgtk-2.0"
+ :libdir #.(pkg-variable "gtk+-2.0" "libdir")
+ :libname #-win32 "libgtk-x11-2.0"
+ #+win32 "libgtk-win32-2.0-0")
(:unix-dso "alien"
:ldflags #.(pkg-libs "gtk+-2.0")
:components ((:c-source-file "glue"
:cflags #.(pkg-cflags "gtk+-2.0")))
(:unix-dso "alien"
:ldflags #.(pkg-libs "gtk+-2.0")
:components ((:c-source-file "glue"
:cflags #.(pkg-cflags "gtk+-2.0")))
-; :depends-on ("libgtk-x11-2.0")
- )
+ :depends-on (#+cmu "libgtk-2.0"))
(:file "gtkobject"
(:file "gtkobject"
- :depends-on ("defpackage" "alien"))
+ :depends-on ("defpackage" "alien"
"libgtk-2.0"
))
(:file "gtktypes" :depends-on ("gtkobject"))
(:file "gtkwidget" :depends-on ("gtktypes"))
(:file "gtkcontainer" :depends-on ("gtktypes"))
(:file "gtktypes" :depends-on ("gtkobject"))
(:file "gtkwidget" :depends-on ("gtktypes"))
(:file "gtkcontainer" :depends-on ("gtktypes"))