diff options
| author | Hans Breuer <hans@breuer.org> | 2001-10-26 14:38:12 +0000 |
|---|---|---|
| committer | Hans Breuer <hans@src.gnome.org> | 2001-10-26 14:38:12 +0000 |
| commit | 11e6236bec75163e81221d694e3f91befe3753cf (patch) | |
| tree | 357226a25fce08e513c25efc77f0939db2c751e6 /gtk/makefile.msc.in | |
| parent | ec3038062876714ae1a044693a1bcb6d2fea5418 (diff) | |
| download | gtk+-11e6236bec75163e81221d694e3f91befe3753cf.tar.gz | |
updated externals
2001-10-26 Hans Breuer <hans@breuer.org>
* gdk-pixbuf/gdk_pixbuf.def :
* gdk/gdk.def :
* gtk/gtk.def : updated externals
* gdk/win32/gdkpixmap-win32.c : removed duplicate of
gdk_window_lookup implementation. It already was in
gdk/win32/gdkwindow-win32.c
* gdk/win32/gdkproperty-win32.c : made it compile again
after GdkAtom API change
* gtk/gtk/makefile.msc.in : updated
Diffstat (limited to 'gtk/makefile.msc.in')
| -rw-r--r-- | gtk/makefile.msc.in | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/gtk/makefile.msc.in b/gtk/makefile.msc.in index 80c451ec1e..d0ad6c91a2 100644 --- a/gtk/makefile.msc.in +++ b/gtk/makefile.msc.in @@ -24,12 +24,13 @@ GDK_PIXBUF_LIBS = ../gdk-pixbuf/gdk_pixbuf-$(GDK_PIXBUF_VER).lib PERL = perl AWK = gawk -INCLUDES = -I . -I .. -I ../gdk -I ../gdk-pixbuf -DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) $(INTL_CFLAGS) $(ATK_CFLAGS) -LDFLAGS = $(ATK_LIBS) /link /machine:ix86 $(LINKDEBUG) +INCLUDES = -I . -I .. -I ../gdk -I ../gdk-pixbuf -DPANGO_ENABLE_BACKEND +DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) \ + $(INTL_CFLAGS) $(ATK_CFLAGS) $(DIRENT_CFLAGS) +LDFLAGS = $(ATK_LIBS) $(DIRENT_LIBS) /link /machine:ix86 $(LINKDEBUG) # Some files use near as an identifier # Don't define GTK_COMPILATION here, because it's for gtk-x.x.dll only -DEFINES = -DG_ENABLE_DEBUG -DG_LOG_DOMAIN=\"Gtk\" -Dnear=xxnear -DGTK_VERSION=\"$(GTK_VER)\" +DEFINES = $(G_DEBUGGING) -DGTK_DISABLE_COMPAT_H -DG_LOG_DOMAIN=\"Gtk\" -Dnear=xxnear -DGTK_VERSION=\"$(GTK_VER)\" TOUCH = copy makefile.msc+nul @@ -43,7 +44,8 @@ all : \ generated \ gtk-stocks-icons \ gtk-win32-$(GTK_VER).dll \ - gtk-win32-$(GTK_VER)s.lib +# gtk-win32-$(GTK_VER)s.lib \ +# gtk-x11-$(GTK_VER).dll gtk_OBJECTS = \ fnmatch.obj \ @@ -61,9 +63,9 @@ gtk_OBJECTS = \ gtkbox.obj \ gtkbutton.obj \ gtkcalendar.obj \ + gtkcelleditable.obj \ gtkcellrenderer.obj \ gtkcellrenderertext.obj \ - gtkcellrenderertextpixbuf.obj \ gtkcellrenderertoggle.obj \ gtkcellrendererpixbuf.obj \ gtkcheckbutton.obj \ @@ -124,7 +126,6 @@ gtk_OBJECTS = \ gtkobject.obj \ gtkoldeditable.obj \ gtkoptionmenu.obj \ -# gtkpacker.obj \ gtkpaned.obj \ gtkpixmap.obj \ gtkplug.obj \ @@ -222,9 +223,9 @@ gtk_public_h_sources = \ gtkcontainer.h \ gtkctree.h \ gtkcurve.h \ + gtkcelleditable.h \ gtkcellrenderer.h \ gtkcellrenderertext.h \ - gtkcellrenderertextpixbuf.h \ gtkcellrenderertoggle.h \ gtkcellrendererpixbuf.h \ gtkdebug.h \ @@ -392,11 +393,14 @@ gtksignal.obj : gtksignal.c gtkmarshal.c gtkmarshal.h # Linking: # gtk-win32-$(GTK_VER).dll : $(gtk_OBJECTS) gtk.def - $(CC) $(CFLAGS) -LD -Fm -Fegtk-win32-$(GTK_VER).dll $(gtk_OBJECTS) $(GDK_LIBS) $(GDK_PIXBUF_LIBS) $(PANGO_LIBS) $(INTL_LIBS) $(GLIB_LIBS) gdi32.lib user32.lib advapi32.lib $(LDFLAGS) /def:gtk.def + $(CC) $(CFLAGS) -LD -Fm -Fegtk-win32-$(GTK_VER).dll $(gtk_OBJECTS) $(GDK_LIBS) $(GDK_PIXBUF_LIBS) $(PANGO_LIBS) $(INTL_LIBS) $(GLIB_LIBS) gdi32.lib user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:gtk.def gtk-win32-$(GTK_VER)s.lib : $(gtk_OBJECTS) lib /out:gtk-win32-$(GTK_VER)s.lib $(gtk_OBJECTS) +gtk-x11-$(GTK_VER).dll : $(gtk_OBJECTS) gtk.def + $(CC) $(CFLAGS) -LD -Fm -Fegtk-x11-$(GTK_VER).dll $(gtk_OBJECTS) ../gdk/gdk-x11-$(GTK_VER).lib $(GDK_PIXBUF_LIBS) $(PANGO_LIBS) $(INTL_LIBS) $(GLIB_LIBS) gdi32.lib user32.lib advapi32.lib $(LDFLAGS) /def:gtk.def + # General rule for compiling the objects into the DLL .c.obj : $(CC) $(CFLAGS) -GD -c -DGTK_COMPILATION -DG_LOG_DOMAIN=\"Gtk\" $< |