diff options
| -rw-r--r-- | ChangeLog | 16 | ||||
| -rw-r--r-- | ChangeLog.pre-2-0 | 16 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 16 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 16 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 16 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 16 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 16 | ||||
| -rw-r--r-- | gdk/Makefile.am | 1 | ||||
| -rw-r--r-- | gdk/win32/gdkevents-win32.c | 15 | ||||
| -rw-r--r-- | gdk/win32/gdkinput.c | 8 | ||||
| -rw-r--r-- | gdk/win32/gdkpango-win32.c | 6 | ||||
| -rw-r--r-- | gdk/win32/gdkwin32id.c | 2 | ||||
| -rw-r--r-- | gtk/makefile.cygwin | 386 | ||||
| -rw-r--r-- | gtk/makefile.mingw.in | 4 |
14 files changed, 123 insertions, 411 deletions
@@ -1,3 +1,19 @@ +2000-07-30 Tor Lillqvist <tml@iki.fi> + + * gdk/Makefile.am: Add makefile.mingw.in to EXTRA_DIST. + + * gdk/win32/gdkevents-win32.c (gdk_events_init, gdk_events_queue): + Remove the g_pipe_readable_msg stuff. Not needed with new GLib + GIOChannel implementation. + + * gdk/win32/gdkinput.c + * gdk/win32/gdkpango-win32.c: Update license name here, too. + + * gdk/win32/gdkwin32id.c (gdk_win32_handle_table_lookup): Fix + definition to match prototype. + + * gtk/makefile.mingw.in: Add libiconv CFLAGS and LIBS. + 2000-07-27 Elliot Lee <sopwith@redhat.com> * gtk/gdk-pixbuf-loader.[ch]: Add gdk_pixbuf_loader_new_with_type diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 9af2061584..ec2a08e64a 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,19 @@ +2000-07-30 Tor Lillqvist <tml@iki.fi> + + * gdk/Makefile.am: Add makefile.mingw.in to EXTRA_DIST. + + * gdk/win32/gdkevents-win32.c (gdk_events_init, gdk_events_queue): + Remove the g_pipe_readable_msg stuff. Not needed with new GLib + GIOChannel implementation. + + * gdk/win32/gdkinput.c + * gdk/win32/gdkpango-win32.c: Update license name here, too. + + * gdk/win32/gdkwin32id.c (gdk_win32_handle_table_lookup): Fix + definition to match prototype. + + * gtk/makefile.mingw.in: Add libiconv CFLAGS and LIBS. + 2000-07-27 Elliot Lee <sopwith@redhat.com> * gtk/gdk-pixbuf-loader.[ch]: Add gdk_pixbuf_loader_new_with_type diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 9af2061584..ec2a08e64a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,19 @@ +2000-07-30 Tor Lillqvist <tml@iki.fi> + + * gdk/Makefile.am: Add makefile.mingw.in to EXTRA_DIST. + + * gdk/win32/gdkevents-win32.c (gdk_events_init, gdk_events_queue): + Remove the g_pipe_readable_msg stuff. Not needed with new GLib + GIOChannel implementation. + + * gdk/win32/gdkinput.c + * gdk/win32/gdkpango-win32.c: Update license name here, too. + + * gdk/win32/gdkwin32id.c (gdk_win32_handle_table_lookup): Fix + definition to match prototype. + + * gtk/makefile.mingw.in: Add libiconv CFLAGS and LIBS. + 2000-07-27 Elliot Lee <sopwith@redhat.com> * gtk/gdk-pixbuf-loader.[ch]: Add gdk_pixbuf_loader_new_with_type diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 9af2061584..ec2a08e64a 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,19 @@ +2000-07-30 Tor Lillqvist <tml@iki.fi> + + * gdk/Makefile.am: Add makefile.mingw.in to EXTRA_DIST. + + * gdk/win32/gdkevents-win32.c (gdk_events_init, gdk_events_queue): + Remove the g_pipe_readable_msg stuff. Not needed with new GLib + GIOChannel implementation. + + * gdk/win32/gdkinput.c + * gdk/win32/gdkpango-win32.c: Update license name here, too. + + * gdk/win32/gdkwin32id.c (gdk_win32_handle_table_lookup): Fix + definition to match prototype. + + * gtk/makefile.mingw.in: Add libiconv CFLAGS and LIBS. + 2000-07-27 Elliot Lee <sopwith@redhat.com> * gtk/gdk-pixbuf-loader.[ch]: Add gdk_pixbuf_loader_new_with_type diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 9af2061584..ec2a08e64a 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,19 @@ +2000-07-30 Tor Lillqvist <tml@iki.fi> + + * gdk/Makefile.am: Add makefile.mingw.in to EXTRA_DIST. + + * gdk/win32/gdkevents-win32.c (gdk_events_init, gdk_events_queue): + Remove the g_pipe_readable_msg stuff. Not needed with new GLib + GIOChannel implementation. + + * gdk/win32/gdkinput.c + * gdk/win32/gdkpango-win32.c: Update license name here, too. + + * gdk/win32/gdkwin32id.c (gdk_win32_handle_table_lookup): Fix + definition to match prototype. + + * gtk/makefile.mingw.in: Add libiconv CFLAGS and LIBS. + 2000-07-27 Elliot Lee <sopwith@redhat.com> * gtk/gdk-pixbuf-loader.[ch]: Add gdk_pixbuf_loader_new_with_type diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 9af2061584..ec2a08e64a 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,19 @@ +2000-07-30 Tor Lillqvist <tml@iki.fi> + + * gdk/Makefile.am: Add makefile.mingw.in to EXTRA_DIST. + + * gdk/win32/gdkevents-win32.c (gdk_events_init, gdk_events_queue): + Remove the g_pipe_readable_msg stuff. Not needed with new GLib + GIOChannel implementation. + + * gdk/win32/gdkinput.c + * gdk/win32/gdkpango-win32.c: Update license name here, too. + + * gdk/win32/gdkwin32id.c (gdk_win32_handle_table_lookup): Fix + definition to match prototype. + + * gtk/makefile.mingw.in: Add libiconv CFLAGS and LIBS. + 2000-07-27 Elliot Lee <sopwith@redhat.com> * gtk/gdk-pixbuf-loader.[ch]: Add gdk_pixbuf_loader_new_with_type diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 9af2061584..ec2a08e64a 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,19 @@ +2000-07-30 Tor Lillqvist <tml@iki.fi> + + * gdk/Makefile.am: Add makefile.mingw.in to EXTRA_DIST. + + * gdk/win32/gdkevents-win32.c (gdk_events_init, gdk_events_queue): + Remove the g_pipe_readable_msg stuff. Not needed with new GLib + GIOChannel implementation. + + * gdk/win32/gdkinput.c + * gdk/win32/gdkpango-win32.c: Update license name here, too. + + * gdk/win32/gdkwin32id.c (gdk_win32_handle_table_lookup): Fix + definition to match prototype. + + * gtk/makefile.mingw.in: Add libiconv CFLAGS and LIBS. + 2000-07-27 Elliot Lee <sopwith@redhat.com> * gtk/gdk-pixbuf-loader.[ch]: Add gdk_pixbuf_loader_new_with_type diff --git a/gdk/Makefile.am b/gdk/Makefile.am index bfbdf1902c..02f7333b26 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -7,6 +7,7 @@ EXTRA_DIST = \ gdkconfig.h.win32 \ gdk.def \ makefile.mingw \ + makefile.mingw.in \ makefile.msc common_includes = @STRIP_BEGIN@ \ diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c index e2fc973587..cc470c3ca2 100644 --- a/gdk/win32/gdkevents-win32.c +++ b/gdk/win32/gdkevents-win32.c @@ -278,11 +278,6 @@ gdk_events_init (void) HMODULE user32, imm32; HINSTANCE commctrl32; - if (g_pipe_readable_msg == 0) - g_pipe_readable_msg = RegisterWindowMessage ("g-pipe-readable"); - GDK_NOTE (EVENTS, g_print ("g-pipe-readable = %#.03x\n", - g_pipe_readable_msg)); - gdk_ping_msg = RegisterWindowMessage ("gdk-ping"); GDK_NOTE (EVENTS, g_print ("gdk-ping = %#.03x\n", gdk_ping_msg)); @@ -2719,16 +2714,6 @@ gdk_events_queue (void) || (active_imm_msgpump_owner->lpVtbl->OnTranslateMessage) (active_imm_msgpump_owner, &msg) != S_OK) TranslateMessage (&msg); - if (msg.message == g_pipe_readable_msg) - { - GDK_NOTE (EVENTS, g_print ("g_pipe_readable_msg: %d %d\n", - msg.wParam, msg.lParam)); - - g_io_channel_win32_pipe_readable (msg.wParam, msg.lParam); - - continue; - } - DispatchMessage (&msg); } } diff --git a/gdk/win32/gdkinput.c b/gdk/win32/gdkinput.c index feb135464b..093439962f 100644 --- a/gdk/win32/gdkinput.c +++ b/gdk/win32/gdkinput.c @@ -2,23 +2,23 @@ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public + * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ /* - * Modified by the GTK+ Team and others 1997-1999. See the AUTHORS + * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with * GTK+ at ftp://ftp.gtk.org/pub/gtk/. diff --git a/gdk/win32/gdkpango-win32.c b/gdk/win32/gdkpango-win32.c index f4c4406933..6b5b5d3ab8 100644 --- a/gdk/win32/gdkpango-win32.c +++ b/gdk/win32/gdkpango-win32.c @@ -2,16 +2,16 @@ * Copyright (C) 2000 Red Hat, Inc. * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public + * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. diff --git a/gdk/win32/gdkwin32id.c b/gdk/win32/gdkwin32id.c index 059e9f47e2..7aab546c4f 100644 --- a/gdk/win32/gdkwin32id.c +++ b/gdk/win32/gdkwin32id.c @@ -68,7 +68,7 @@ gdk_win32_handle_table_remove (HANDLE handle) } gpointer -gdk_win32_handle_table_lookup (HANDLE handle) +gdk_win32_handle_table_lookup (GdkNativeWindow handle) { gpointer data = NULL; diff --git a/gtk/makefile.cygwin b/gtk/makefile.cygwin deleted file mode 100644 index 146647c91d..0000000000 --- a/gtk/makefile.cygwin +++ /dev/null @@ -1,386 +0,0 @@ -## Makefile for building the GTK DLL with gcc-2.95 or later on cygwin -## Use: make -f makefile.cygwin - -## There is no install target, you have to decide where and -## how to install for yourself. - -# This is the location of pthreads for Win32, -# see http://sourceware.cygnus.com/pthreads-win32/ -PTHREADS = ../../pthreads-snap-1999-05-30 -PTHREAD_LIB = -L $(PTHREADS) -lpthread -PTHREAD_INC = -I $(PTHREADS) - -OPTIMIZE = -g - -TOP = ../.. - -include $(TOP)/build/win32/make.mingw - -################################################################ - -# Nothing much configurable below - -# Perl and awk are needed to generate some source files. -# These generated source files are distributed with the Win32 GTk+ source -# distributions, so don't worry if you don't have perl and awk. -PERL = perl -AWK = awk - -INCLUDES = -I . -I .. -I ../gdk -I $(GLIB) -I $(GLIB)/gmodule -I $(INTL) -DEFINES = -DGTK_DISABLE_COMPAT_H -DGTK_COMPILATION -DG_LOG_DOMAIN=\"Gtk\" -DG_LOG_DOMAIN=\"Gtk\" - -WIN32APIHEADERS=$(shell echo "\#include <winver.h>" | $(CC) -M -E - | tail -1 | sed -e 's![\\/]winver.h!!' | tr -d '\015') - -all : \ - ../config.h \ - gtkcompat.h \ - generated \ - gtk-$(GTK_VER).dll\ - testdnd.exe \ - testgtk.exe \ - testinput.exe \ - testrgb.exe \ - testselection.exe \ - simple.exe - -gtk_OBJECTS = \ - fnmatch.o \ - gtkaccelgroup.o \ - gtkaccellabel.o \ - gtkadjustment.o \ - gtkalignment.o \ - gtkarg.o \ - gtkarrow.o \ - gtkaspectframe.o\ - gtkbbox.o \ - gtkbin.o \ - gtkbindings.o \ - gtkbox.o \ - gtkbutton.o \ - gtkcalendar.o \ - gtkcheckbutton.o\ - gtkcheckmenuitem.o\ - gtkclist.o \ - gtkcolorsel.o \ - gtkcolorseldialog.o \ - gtkcombo.o \ - gtkcontainer.o \ - gtkctree.o \ - gtkcurve.o \ - gtkdata.o \ - gtkdialog.o \ - gtkdnd.o \ - gtkdrawingarea.o\ - gtkeditable.o \ - gtkentry.o \ - gtkeventbox.o \ - gtkfilesel.o \ - gtkfixed.o \ - gtkfontsel.o \ - gtkframe.o \ - gtkgamma.o \ - gtkgc.o \ - gtkhandlebox.o \ - gtkhbbox.o \ - gtkhbox.o \ - gtkhpaned.o \ - gtkhruler.o \ - gtkhscale.o \ - gtkhscrollbar.o \ - gtkhseparator.o \ - gtkhsv.o \ - gtkimage.o \ - gtkinputdialog.o\ - gtkinvisible.o \ - gtkitem.o \ - gtkitemfactory.o\ - gtklabel.o \ - gtklayout.o \ - gtklist.o \ - gtklistitem.o \ - gtkmain.o \ - gtkmarshal.o \ - gtkmenu.o \ - gtkmenubar.o \ - gtkmenufactory.o\ - gtkmenuitem.o \ - gtkmenushell.o \ - gtkmisc.o \ - gtknotebook.o \ - gtkobject.o \ - gtkoptionmenu.o \ - gtkpacker.o \ - gtkpaned.o \ - gtkpixmap.o \ - gtkplug.o \ - gtkpreview.o \ - gtkprogress.o \ - gtkprogressbar.o\ - gtkradiobutton.o\ - gtkradiomenuitem.o\ - gtkrange.o \ - gtkrc.o \ - gtkruler.o \ - gtkscale.o \ - gtkscrollbar.o \ - gtkscrolledwindow.o\ - gtkselection.o \ - gtkseparator.o \ - gtksignal.o \ - gtksocket.o \ - gtkspinbutton.o \ - gtkstatusbar.o \ - gtkstyle.o \ - gtktable.o \ - gtktearoffmenuitem.o\ - gtktext.o \ - gtkthemes.o \ - gtktipsquery.o \ - gtktogglebutton.o\ - gtktoolbar.o \ - gtktooltips.o \ - gtktree.o \ - gtktreeitem.o \ - gtktypeutils.o \ - gtkvbbox.o \ - gtkvbox.o \ - gtkviewport.o \ - gtkvpaned.o \ - gtkvruler.o \ - gtkvscale.o \ - gtkvscrollbar.o \ - gtkvseparator.o \ - gtkwidget.o \ - gtkwindow.o - -# Source headers which are non-autogenerated headers -source_headers = \ - gtk.h \ - gtkaccelgroup.h \ - gtkaccellabel.h \ - gtkadjustment.h \ - gtkalignment.h \ - gtkarg.h \ - gtkarrow.h \ - gtkaspectframe.h \ - gtkbin.h \ - gtkbindings.h \ - gtkbbox.h \ - gtkbox.h \ - gtkbutton.h \ - gtkcalendar.h \ - gtkcheckbutton.h \ - gtkcheckmenuitem.h \ - gtkclist.h \ - gtkcolorsel.h \ - gtkcolorseldialog.h \ - gtkcombo.h \ - gtkcontainer.h \ - gtkctree.h \ - gtkcurve.h \ - gtkdata.h \ - gtkdebug.h \ - gtkdialog.h \ - gtkdnd.h \ - gtkdrawingarea.h \ - gtkeditable.h \ - gtkentry.h \ - gtkenums.h \ - gtkeventbox.h \ - gtkfilesel.h \ - gtkfixed.h \ - gtkfontsel.h \ - gtkframe.h \ - gtkgamma.h \ - gtkgc.h \ - gtkhandlebox.h \ - gtkhbbox.h \ - gtkhbox.h \ - gtkhpaned.h \ - gtkhruler.h \ - gtkhscale.h \ - gtkhscrollbar.h \ - gtkhseparator.h \ - gtkhsv.h \ - gtkimage.h \ - gtkinputdialog.h \ - gtkinvisible.h \ - gtkitem.h \ - gtkitemfactory.h \ - gtklabel.h \ - gtklayout.h \ - gtklist.h \ - gtklistitem.h \ - gtkmain.h \ - gtkmenu.h \ - gtkmenubar.h \ - gtkmenufactory.h \ - gtkmenuitem.h \ - gtkmenushell.h \ - gtkmisc.h \ - gtknotebook.h \ - gtkobject.h \ - gtkoptionmenu.h \ - gtkpacker.h \ - gtkpaned.h \ - gtkpixmap.h \ - gtkplug.h \ - gtkpreview.h \ - gtkprivate.h \ - gtkprogress.h \ - gtkprogressbar.h \ - gtkradiobutton.h \ - gtkradiomenuitem.h \ - gtkrange.h \ - gtkrc.h \ - gtkruler.h \ - gtkscale.h \ - gtkscrollbar.h \ - gtkscrolledwindow.h \ - gtkselection.h \ - gtkseparator.h \ - gtksignal.h \ - gtksocket.h \ - gtkspinbutton.h \ - gtkstyle.h \ - gtkstatusbar.h \ - gtktable.h \ - gtktearoffmenuitem.h \ - gtktext.h \ - gtkthemes.h \ - gtktipsquery.h \ - gtktogglebutton.h \ - gtktoolbar.h \ - gtktooltips.h \ - gtktree.h \ - gtktreeitem.h \ - gtktypeutils.h \ - gtkvbbox.h \ - gtkvbox.h \ - gtkviewport.h \ - gtkvpaned.h \ - gtkvruler.h \ - gtkvscale.h \ - gtkvscrollbar.h \ - gtkvseparator.h \ - gtkwidget.h \ - gtkwindow.h - -# More headers to use when autogenerating. -gdk_headers = \ - ../gdk/gdkcc.h \ - ../gdk/gdkcolor.h \ - ../gdk/gdkcursor.h \ - ../gdk/gdkdnd.h \ - ../gdk/gdkdrawable.h \ - ../gdk/gdkevents.h \ - ../gdk/gdkfont.h \ - ../gdk/gdkgc.h \ - ../gdk/gdkim.h \ - ../gdk/gdkimage.h \ - ../gdk/gdkinput.h \ - ../gdk/gdkpixmap.h \ - ../gdk/gdkproperty.h \ - ../gdk/gdkregion.h \ - ../gdk/gdkrgb.h \ - ../gdk/gdkselection.h \ - ../gdk/gdktypes.h \ - ../gdk/gdkvisual.h \ - ../gdk/gdkwindow.h - -../config.h : ../config.h.win32 - cp ../config.h.win32 ../config.h - -gtkcompat.h : gtkcompat.h.win32 - cp gtkcompat.h.win32 gtkcompat.h - -GENERATED = gtk.defs gtktypebuiltins.h gtktypebuiltins_vars.c gtktypebuiltins_ids.c gtktypebuiltins_evals.c gtkmarshal.h gtkmarshal.c - -# -# Generated source files: -# -generated : $(GENERATED) - -gtk.defs : makeenums.pl gtk-boxed.defs $(source_headers) $(gdk_headers) - $(PERL) makeenums.pl defs $(source_headers) $(gdk_headers) >gd.tmp - cat gd.tmp gtk-boxed.defs >gtk.defs - rm gd.tmp - -# generate type identifier header (GTK_TYPE_WIDGET_FLAGS) -gtktypebuiltins.h: gtk.defs maketypes.awk - $(AWK) -f maketypes.awk gtk.defs macros >gtktypebuiltins.h - -# generate type identifier variables (GTK_TYPE_WIDGET_FLAGS) -gtktypebuiltins_vars.c: gtk.defs maketypes.awk - $(AWK) -f maketypes.awk gtk.defs variables >gtktypebuiltins_vars.c - -# generate type entries for type-id registration -gtktypebuiltins_ids.c: gtk.defs maketypes.awk - $(AWK) -f maketypes.awk gtk.defs entries >gtktypebuiltins_ids.c - -# generate enum value arrays -gtktypebuiltins_evals.c: makeenums.pl gtk.defs - $(PERL) makeenums.pl arrays $(source_headers) $(gdk_headers) >gtktypebuiltins_evals.c - -gtkmarshal.h gtkmarshal.c : gtkmarshal.list genmarshal.pl - $(PERL) genmarshal.pl gtkmarshal.list s-gmh s-gmc - -rm gtkmarshal.c - mv s-gmc gtkmarshal.c - -rm gtkmarshal.h - mv s-gmh gtkmarshal.h - -# -# Linking: -# -gtk-$(GTK_VER).dll : generated $(gtk_OBJECTS) gtk.def - $(GLIB)/build-dll gtk $(GTK_VER) gtk.def $(gtk_OBJECTS) -L ../gdk -lgdk-$(GTK_VER) -L$(INTL) -lgnu-intl -L $(GLIB) -lglib-$(GLIB_VER) -L $(GLIB)/gmodule -lgmodule-$(GLIB_VER) -L $(GLIB)/gobject -lgobject-$(GLIB_VER) -luser32 - -# -# Test programs: -# -testdnd.exe : testdnd.o - $(CC) $(CFLAGS) -o $@ testdnd.o -L . -lgtk-$(GTK_VER) -L ../gdk -lgdk-$(GTK_VER) $(GLIB_LIBS) $(LDFLAGS) - -# Must have separate rules for these objects that don't go in the DLL -testdnd.o : testdnd.c - $(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testdnd\" testdnd.c - -testgtk.exe : testgtk.o - $(CC) $(CFLAGS) -o $@ testgtk.o -L . -lgtk-$(GTK_VER) -L ../gdk -lgdk-$(GTK_VER) $(GLIB_LIBS) $(LDFLAGS) - -testgtk.o : testgtk.c - $(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testgtk\" testgtk.c - -testinput.exe : testinput.o - $(CC) $(CFLAGS) -o $@ testinput.o -L . -lgtk-$(GTK_VER) -L ../gdk -lgdk-$(GTK_VER) $(GLIB_LIBS) $(LDFLAGS) - -testinput.o : testinput.c - $(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testinput\" testinput.c - -testrgb.exe : testrgb.o - $(CC) $(CFLAGS) -o $@ testrgb.o -L . -lgtk-$(GTK_VER) -L ../gdk -lgdk-$(GTK_VER) $(GLIB_LIBS) $(LDFLAGS) - -testrgb.o : testrgb.c - $(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testrgb\" testrgb.c - -testselection.exe : testselection.o - $(CC) $(CFLAGS) -o $@ testselection.o -L . -lgtk-$(GTK_VER) -L ../gdk -lgdk-$(GTK_VER) $(GLIB_LIBS) $(LDFLAGS) - -testselection.o : testselection.c - $(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testselection\" testselection.c - -testthreads.exe : testthreads.o - $(CC) $(CFLAGS) -o $@ testthreads.o -L . -lgtk-$(GTK_VER) -L ../gdk -lgdk-$(GTK_VER) $(GLIB_LIBS) $(PTHREAD_LIB) $(LDFLAGS) - -testthreads.o : testthreads.c - $(CC) $(CFLAGS) -I$(PTHREAD_INC) -c -DG_LOG_DOMAIN=\"testthreads\" -DUSE_PTHREADS=1 testthreads.c - -simple.exe : simple.o - $(CC) $(CFLAGS) -o $@ simple.o -L . -lgtk-$(GTK_VER) -L ../gdk -lgdk-$(GTK_VER) $(GLIB_LIBS) $(LDFLAGS) - -simple.o : simple.c - $(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"simple\" simple.c - -# The rmgen target removes just the generated source files -rmgen: - -rm $(GENERATED) diff --git a/gtk/makefile.mingw.in b/gtk/makefile.mingw.in index c2cf503101..7ef75d214c 100644 --- a/gtk/makefile.mingw.in +++ b/gtk/makefile.mingw.in @@ -32,7 +32,7 @@ PERL = perl AWK = awk INCLUDES = -I . -I .. -I ../gdk -I ../gdk-pixbuf -DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(INTL_CFLAGS) +DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) $(INTL_CFLAGS) DEFINES = -DGTK_DISABLE_COMPAT_H -DGTK_COMPILATION -DG_LOG_DOMAIN=\"Gtk\" all : \ @@ -366,7 +366,7 @@ gtkmarshal.h gtkmarshal.c : gtkmarshal.list genmarshal.pl # Linking: # gtk-win32-$(GTK_VER).dll : generated $(gtk_OBJECTS) gtk.def - $(GLIB)/build-dll gtk-win32 $(GTK_VER) gtk.def $(gtk_OBJECTS) $(GDK_LIBS) $(GDK_PIXBUF_LIBS) $(PANGO_LIBS) $(INTL_LIBS) $(GLIB_LIBS) -luser32 + $(GLIB)/build-dll gtk-win32 $(GTK_VER) gtk.def $(gtk_OBJECTS) $(GDK_LIBS) $(GDK_PIXBUF_LIBS) $(PANGO_LIBS) $(GLIB_LIBS) $(LIBICONV_LIBS) $(INTL_LIBS) -luser32 # # Test programs: |