AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Add makefile.mingw.in to EXTRA_DIST.

Browse Source 
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.
This commit is contained in:
Tor Lillqvist 2000-07-30 08:11:28 +00:00 committed by Tor Lillqvist
parent 9ff07fdad9
commit 471396fdd4
14 changed files with 123 additions and 411 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ChangeLog
View File

@ -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> 2000-07-27 Elliot Lee <sopwith@redhat.com>
* gtk/gdk-pixbuf-loader.[ch]: Add gdk_pixbuf_loader_new_with_type * gtk/gdk-pixbuf-loader.[ch]: Add gdk_pixbuf_loader_new_with_type

16
ChangeLog.pre-2-0
View File

@ -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> 2000-07-27 Elliot Lee <sopwith@redhat.com>
* gtk/gdk-pixbuf-loader.[ch]: Add gdk_pixbuf_loader_new_with_type * gtk/gdk-pixbuf-loader.[ch]: Add gdk_pixbuf_loader_new_with_type

16
ChangeLog.pre-2-10
View File

@ -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> 2000-07-27 Elliot Lee <sopwith@redhat.com>
* gtk/gdk-pixbuf-loader.[ch]: Add gdk_pixbuf_loader_new_with_type * gtk/gdk-pixbuf-loader.[ch]: Add gdk_pixbuf_loader_new_with_type

16
ChangeLog.pre-2-2
View File

@ -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> 2000-07-27 Elliot Lee <sopwith@redhat.com>
* gtk/gdk-pixbuf-loader.[ch]: Add gdk_pixbuf_loader_new_with_type * gtk/gdk-pixbuf-loader.[ch]: Add gdk_pixbuf_loader_new_with_type

16
ChangeLog.pre-2-4
View File

@ -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> 2000-07-27 Elliot Lee <sopwith@redhat.com>
* gtk/gdk-pixbuf-loader.[ch]: Add gdk_pixbuf_loader_new_with_type * gtk/gdk-pixbuf-loader.[ch]: Add gdk_pixbuf_loader_new_with_type

16
ChangeLog.pre-2-6
View File

@ -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> 2000-07-27 Elliot Lee <sopwith@redhat.com>
* gtk/gdk-pixbuf-loader.[ch]: Add gdk_pixbuf_loader_new_with_type * gtk/gdk-pixbuf-loader.[ch]: Add gdk_pixbuf_loader_new_with_type

16
ChangeLog.pre-2-8
View File

@ -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> 2000-07-27 Elliot Lee <sopwith@redhat.com>
* gtk/gdk-pixbuf-loader.[ch]: Add gdk_pixbuf_loader_new_with_type * gtk/gdk-pixbuf-loader.[ch]: Add gdk_pixbuf_loader_new_with_type

1
gdk/Makefile.am
View File

@ -7,6 +7,7 @@ EXTRA_DIST = \
gdkconfig.h.win32 \ gdkconfig.h.win32 \
gdk.def \ gdk.def \
makefile.mingw \ makefile.mingw \
makefile.mingw.in \
makefile.msc makefile.msc
common_includes = @STRIP_BEGIN@ \ common_includes = @STRIP_BEGIN@ \

15
gdk/win32/gdkevents-win32.c
View File

@ -278,11 +278,6 @@ gdk_events_init (void)
HMODULE user32, imm32; HMODULE user32, imm32;
HINSTANCE commctrl32; 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_ping_msg = RegisterWindowMessage ("gdk-ping");
GDK_NOTE (EVENTS, g_print ("gdk-ping = %#.03x\n", GDK_NOTE (EVENTS, g_print ("gdk-ping = %#.03x\n",
gdk_ping_msg)); gdk_ping_msg));
@ -2719,16 +2714,6 @@ gdk_events_queue (void)
|| (active_imm_msgpump_owner->lpVtbl->OnTranslateMessage) (active_imm_msgpump_owner, &msg) != S_OK) || (active_imm_msgpump_owner->lpVtbl->OnTranslateMessage) (active_imm_msgpump_owner, &msg) != S_OK)
TranslateMessage (&msg); 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); DispatchMessage (&msg);
} }
} }

8
gdk/win32/gdkinput.c
View File

@ -2,23 +2,23 @@
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
* *
* This library is free software; you can redistribute it and/or * 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 * License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version. * version 2 of the License, or (at your option) any later version.
* *
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * 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 * License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA. * 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 * file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with * files for a list of changes. These files are distributed with
* GTK+ at ftp://ftp.gtk.org/pub/gtk/. * GTK+ at ftp://ftp.gtk.org/pub/gtk/.

6
gdk/win32/gdkpango-win32.c
View File

@ -2,16 +2,16 @@
* Copyright (C) 2000 Red Hat, Inc. * Copyright (C) 2000 Red Hat, Inc.
* *
* This library is free software; you can redistribute it and/or * 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 * License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version. * version 2 of the License, or (at your option) any later version.
* *
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * 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 * License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.

2
gdk/win32/gdkwin32id.c
View File

@ -68,7 +68,7 @@ gdk_win32_handle_table_remove (HANDLE handle)
} }
gpointer gpointer
gdk_win32_handle_table_lookup (HANDLE handle) gdk_win32_handle_table_lookup (GdkNativeWindow handle)
{ {
gpointer data = NULL; gpointer data = NULL;

386
gtk/makefile.cygwin
View File

@ -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)

4
gtk/makefile.mingw.in
View File

@ -32,7 +32,7 @@ PERL = perl
AWK = awk AWK = awk
INCLUDES = -I . -I .. -I ../gdk -I ../gdk-pixbuf 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\" DEFINES = -DGTK_DISABLE_COMPAT_H -DGTK_COMPILATION -DG_LOG_DOMAIN=\"Gtk\"
all : \ all : \
@ -366,7 +366,7 @@ gtkmarshal.h gtkmarshal.c : gtkmarshal.list genmarshal.pl
# Linking: # Linking:
# #
gtk-win32-$(GTK_VER).dll : generated $(gtk_OBJECTS) gtk.def 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: # Test programs: