mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2025-01-12 05:20:17 +00:00
updated fix c99ism (variable at start of block export functions for window
2008-05-23 Hans Breuer <hans@breuer.org> * **/makefile.msc gtk/makefile.msc.in : updated * gtk/gtkwidget.c : fix c99ism (variable at start of block * gdk/gdk.symbols gtk/gtk.symbols : export functions for window redirection * gtk/gtkfilechooserdefault.c : #include <locale.h> for setlocale(LC_ALL, ...) svn path=/trunk/; revision=20131
This commit is contained in:
Hans Breuer
Hans Breuer
parent
a8b5f3ee6b
commit
0b57c6b98f
@ -1,3 +1,12 @@
|
||||
2008-05-23 Hans Breuer <hans@breuer.org>
|
||||
|
||||
* **/makefile.msc gtk/makefile.msc.in : updated
|
||||
* gtk/gtkwidget.c : fix c99ism (variable at start of block
|
||||
* gdk/gdk.symbols gtk/gtk.symbols : export functions for window
|
||||
redirection
|
||||
* gtk/gtkfilechooserdefault.c : #include <locale.h> for
|
||||
setlocale(LC_ALL, ...)
|
||||
|
||||
2008-05-23 Tor Lillqvist <tml@novell.com>
|
||||
|
||||
* gdk/gdk.symbols: Add gdk_window_redirect_to_drawable and
|
||||
|
||||
@ -11,30 +11,47 @@ PERL = perl
|
||||
|
||||
GDK_PIXBUF_VER = 2.0
|
||||
|
||||
# -DINCLUDE_gdiplus _replaces_ -DINCLUDE_bmp -DINCLUDE_gif -DINCLUDE_ico -DINCLUDE_jpeg -DINCLUDE_tiff
|
||||
# but not yet -DINCLUDE_png
|
||||
# to get _working_ include modules we need respective defines ...
|
||||
BUILT_IN_FORMATS = -DINCLUDE_png -DINCLUDE_bmp -DINCLUDE_gif \
|
||||
-DINCLUDE_ico -DINCLUDE_jpeg -DINCLUDE_xpm -DINCLUDE_wbmp \
|
||||
BUILT_IN_FORMATS = -DINCLUDE_gdiplus -DINCLUDE_png \
|
||||
-DINCLUDE_xpm -DINCLUDE_wbmp \
|
||||
-DINCLUDE_pnm -DINCLUDE_ras
|
||||
|
||||
# -DINCLUDE_tiff
|
||||
|
||||
|
||||
|
||||
PKG_CFLAGS = -FImsvc_recommended_pragmas.h \
|
||||
# $(JPEG_CFLAGS) $(TIFF_CFLAGS) \
|
||||
-I. -I.. $(GLIB_CFLAGS) \
|
||||
$(BUILT_IN_FORMATS) \
|
||||
$(JPEG_CFLAGS) $(PNG_CFLAGS) $(TIFF_CFLAGS) $(INTL_CFLAGS) \
|
||||
$(PNG_CFLAGS) $(INTL_CFLAGS) \
|
||||
$(G_DEBUGGING) \
|
||||
-DGDK_PIXBUF_ENABLE_BACKEND \
|
||||
-DGTK_PREFIX=\"/just/some/non/existing/path/\" \
|
||||
-UUSE_GMODULE # use built-in
|
||||
# -DUSE_GMODULE -DPIXBUF_LIBDIR=\".\"
|
||||
|
||||
|
||||
PKG_LINK = $(GLIB_LIBS) \
|
||||
# $(TIFF_LIBS) \
|
||||
$(JPEG_LIBS) $(PNG_LIBS) $(INTL_LIBS) \
|
||||
# $(TIFF_LIBS) $(JPEG_LIBS) \
|
||||
$(PNG_LIBS) $(INTL_LIBS) \
|
||||
pixops\pixops.lib \
|
||||
|
||||
OBJECTS_NON_NATIVE = \
|
||||
io-bmp.obj \
|
||||
io-gif.obj \
|
||||
io-ico.obj \
|
||||
io-tiff.obj \
|
||||
io-jpeg.obj \
|
||||
|
||||
OBJECTS_NATIVE = \
|
||||
io-gdip-animation.obj \
|
||||
io-gdip-bmp.obj \
|
||||
io-gdip-emf.obj \
|
||||
io-gdip-gif.obj \
|
||||
io-gdip-ico.obj \
|
||||
io-gdip-jpeg.obj \
|
||||
io-gdip-tiff.obj \
|
||||
io-gdip-utils.obj \
|
||||
io-gdip-wmf.obj
|
||||
|
||||
OBJECTS = \
|
||||
gdk-pixbuf-enum-types.obj \
|
||||
gdk-pixbuf-animation.obj \
|
||||
@ -47,17 +64,13 @@ OBJECTS = \
|
||||
gdk-pixbuf.obj \
|
||||
gdk-pixbuf-simple-anim.obj \
|
||||
gdk-pixdata.obj \
|
||||
io-bmp.obj \
|
||||
io-wbmp.obj \
|
||||
io-gif.obj \
|
||||
io-gif-animation.obj \
|
||||
io-ico.obj \
|
||||
io-png.obj \
|
||||
io-pnm.obj \
|
||||
io-ras.obj \
|
||||
# io-tiff.obj \
|
||||
io-xpm.obj \
|
||||
io-jpeg.obj \
|
||||
$(OBJECTS_NATIVE)
|
||||
|
||||
gdk_pixbuf_headers = \
|
||||
gdk-pixbuf.h \
|
||||
@ -115,7 +128,7 @@ $(PACKAGE)-$(PKG_VER)s.lib : $(OBJECTS)
|
||||
lib /out:$(PACKAGE)-$(PKG_VER)s.lib $(OBJECTS) pixops\pixops.lib
|
||||
|
||||
lib$(PACKAGE)-$(PKG_VER)-0.dll : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res
|
||||
$(CC) $(CFLAGS) -LD -Fe$@ $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(PACKAGE).res \
|
||||
$(CC) $(CFLAGS) -LD -Fe$@ $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib ole32.lib wsock32.lib $(PACKAGE).res \
|
||||
$(LDFLAGS) /implib:$(PACKAGE)-$(PKG_VER).lib /def:$(PACKAGE).def
|
||||
|
||||
make-inline-pixbuf.exe : make-inline-pixbuf.c
|
||||
|
||||
@ -681,7 +681,9 @@ gdk_window_object_get_type G_GNUC_CONST
|
||||
gdk_window_peek_children
|
||||
gdk_window_process_all_updates
|
||||
gdk_window_process_updates
|
||||
gdk_window_redirect_to_drawable
|
||||
gdk_window_remove_filter
|
||||
gdk_window_remove_redirection
|
||||
gdk_window_set_debug_updates
|
||||
gdk_window_set_user_data
|
||||
gdk_window_thaw_toplevel_updates_libgtk_only
|
||||
|
||||
@ -11,7 +11,9 @@ TOP = ..\..
|
||||
|
||||
# Location of the Wintab toolkit. Downloadable from http://www.pointing.com.
|
||||
# definition should possibly go to build/win32/module.def, too.
|
||||
WTKIT = ..\..\wtkit126
|
||||
!IFNDEF WTKIT
|
||||
WTKIT = $(TOP)\wtkit126
|
||||
!ENDIF
|
||||
|
||||
###############################################################
|
||||
|
||||
@ -46,10 +48,12 @@ CFLAGS = -FImsvc_recommended_pragmas.h -I . -I .. \
|
||||
-DGDK_VERSION=\"$(GTK_VER)\" \
|
||||
-DG_LOG_DOMAIN=\"Gdk\"
|
||||
|
||||
EXTRALIBS = $(WTKIT)\lib\i386\wntab32x.lib $(GLIB_LIBS) \
|
||||
..\gdk-pixbuf\gdk_pixbuf-$(GDK_PIXBUF_VER).lib \
|
||||
$(PANGOWIN32_LIBS) $(INTL_LIBS) $(CAIRO_LIBS) \
|
||||
$(PANGOCAIRO_LIBS)
|
||||
EXTRALIBS = \
|
||||
$(WTKIT)\lib\i386\wntab32x.lib \
|
||||
$(GLIB_LIBS) \
|
||||
..\gdk-pixbuf\gdk_pixbuf-$(GDK_PIXBUF_VER).lib \
|
||||
$(PANGOWIN32_LIBS) $(INTL_LIBS) $(CAIRO_LIBS) \
|
||||
$(PANGOCAIRO_LIBS)
|
||||
|
||||
gdk-win32-backend :
|
||||
cd win32
|
||||
@ -73,6 +77,7 @@ all: \
|
||||
|
||||
gdk_OBJECTS = \
|
||||
gdk.obj \
|
||||
gdkapplaunchcontext.obj \
|
||||
gdkcairo.obj \
|
||||
gdkcolor.obj \
|
||||
gdkcursor.obj \
|
||||
@ -134,11 +139,13 @@ gdkmarshalers.h : gdkmarshalers.list
|
||||
gdkmarshalers.c : gdkmarshalers.list
|
||||
$(GLIB)\gobject\glib-genmarshal --prefix=gdk_marshal gdkmarshalers.list --body >gdkmarshalers.c
|
||||
|
||||
gdkenumtypes.h: $(gdk_public_h_sources) makeenums.pl
|
||||
$(PERL) makeenums.pl include $(gdk_public_h_sources) > gdkenumtypes.h
|
||||
gdkenumtypes.h: $(gdk_public_h_sources) gdkenumtypes.h.template
|
||||
$(PERL) $(GLIB)\gobject\glib-mkenums --template gdkenumtypes.h.template \
|
||||
$(gdk_public_h_sources) > gdkenumtypes.h
|
||||
|
||||
gdkenumtypes.c: $(gdk_public_h_sources) makeenums.pl
|
||||
$(PERL) makeenums.pl cfile $(gdk_public_h_sources) > gdkenumtypes.c
|
||||
gdkenumtypes.c: $(gdk_public_h_sources) gdkenumtypes.c.template
|
||||
$(PERL) $(GLIB)\gobject\glib-mkenums --template gdkenumtypes.c.template \
|
||||
$(gdk_public_h_sources) > gdkenumtypes.c
|
||||
|
||||
..\config.h : ..\config.h.win32
|
||||
copy ..\config.h.win32 ..\config.h
|
||||
|
||||
@ -1,9 +1,6 @@
|
||||
## Makefile for building the GDK DLL with Microsoft C
|
||||
## Use: nmake -f makefile.msc
|
||||
|
||||
# Location of the Wintab toolkit. Downloadable from http://www.pointing.com.
|
||||
WTKIT = ..\..\..\wtkit126
|
||||
|
||||
################################################################
|
||||
|
||||
# Nothing much configurable below
|
||||
@ -11,6 +8,12 @@ WTKIT = ..\..\..\wtkit126
|
||||
TOP = ../../..
|
||||
!INCLUDE $(TOP)/glib/build/win32/make.msc
|
||||
|
||||
# Location of the Wintab toolkit. Downloadable from http://www.pointing.com.
|
||||
# definition should possibly go to build/win32/module.def, too.
|
||||
!IFNDEF WTKIT
|
||||
WTKIT = $(TOP)\wtkit126
|
||||
!ENDIF
|
||||
|
||||
GTK_VER=2.0
|
||||
|
||||
CFLAGS = -FImsvc_recommended_pragmas.h \
|
||||
@ -25,6 +28,7 @@ all: \
|
||||
gdk.res
|
||||
|
||||
gdk_win32_OBJECTS = \
|
||||
gdkapplaunchcontext-win32.obj \
|
||||
gdkcolor-win32.obj \
|
||||
gdkcursor-win32.obj \
|
||||
gdkdnd-win32.obj \
|
||||
@ -47,6 +51,7 @@ gdk_win32_OBJECTS = \
|
||||
gdkscreen-win32.obj \
|
||||
gdkselection-win32.obj \
|
||||
gdkspawn-win32.obj \
|
||||
gdktestutils-win32.obj \
|
||||
gdkvisual-win32.obj \
|
||||
gdkwin32id.obj \
|
||||
gdkwindow-win32.obj
|
||||
|
||||
@ -4718,6 +4718,7 @@ gtk_widget_get_root_window
|
||||
gtk_widget_get_screen
|
||||
gtk_widget_get_settings
|
||||
gtk_widget_get_size_request
|
||||
gtk_widget_get_snapshot
|
||||
gtk_widget_get_style
|
||||
gtk_widget_get_tooltip_markup
|
||||
gtk_widget_get_tooltip_text
|
||||
|
||||
@ -84,7 +84,7 @@
|
||||
#include <time.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
#include <locale.h>
|
||||
|
||||
#ifdef HAVE_UNISTD_H
|
||||
#include <unistd.h>
|
||||
|
||||
@ -8349,6 +8349,7 @@ gtk_widget_get_snapshot (GtkWidget *widget,
|
||||
int x, y, width, height;
|
||||
GdkWindow *parent_window = NULL;
|
||||
GdkPixmap *pixmap;
|
||||
GList *windows = NULL, *list;
|
||||
|
||||
/* the widget (and parent_window) must be realized to be drawable */
|
||||
if (widget->parent && !GTK_WIDGET_REALIZED (widget->parent))
|
||||
@ -8361,7 +8362,7 @@ gtk_widget_get_snapshot (GtkWidget *widget,
|
||||
y = widget->allocation.y;
|
||||
width = widget->allocation.width;
|
||||
height = widget->allocation.height;
|
||||
GList *windows = NULL, *list;
|
||||
|
||||
if (widget->parent && !GTK_WIDGET_NO_WINDOW (widget))
|
||||
{
|
||||
/* grow snapshot rectangle to cover all widget windows */
|
||||
|
||||
@ -73,7 +73,7 @@ gtkbuiltincache.h: gtk-update-icon-cache.exe
|
||||
GENERATED = \
|
||||
gtktypebuiltins.h gtktypebuiltins.c \
|
||||
gtkmarshal.h gtkmarshal.c gtkmarshalers.h gtkmarshalers.c \
|
||||
gtk.def gtkalias.h gtkaliasdef.c
|
||||
gtk.def gtkalias.h gtkaliasdef.c gtktypefuncs.c
|
||||
|
||||
all : \
|
||||
..\config.h \
|
||||
@ -85,242 +85,256 @@ all : \
|
||||
# gtk-win32-$(GTK_VER)s.lib \
|
||||
# gtk-x11-$(GTK_VER).dll
|
||||
|
||||
gtk_OBJECTS = \
|
||||
fnmatch.obj \
|
||||
gtkaboutdialog.obj \
|
||||
gtkaccelgroup.obj \
|
||||
gtkaccellabel.obj \
|
||||
gtkaccelmap.obj \
|
||||
gtkaccessible.obj \
|
||||
gtkaction.obj \
|
||||
gtkactiongroup.obj \
|
||||
gtkadjustment.obj \
|
||||
gtkalignment.obj \
|
||||
gtkarrow.obj \
|
||||
gtkaspectframe.obj \
|
||||
gtkassistant.obj \
|
||||
gtkbin.obj \
|
||||
gtkbindings.obj \
|
||||
gtkbbox.obj \
|
||||
gtkbox.obj \
|
||||
gtkbuildable.obj \
|
||||
gtkbuilder.obj \
|
||||
gtkbuilderparser.obj \
|
||||
gtkbutton.obj \
|
||||
gtkcalendar.obj \
|
||||
gtkcelleditable.obj \
|
||||
gtkcelllayout.obj \
|
||||
gtkcellrenderer.obj \
|
||||
gtk_OBJECTS_deprecated = \
|
||||
gtkcombo.obj \
|
||||
gtkclist.obj \
|
||||
gtkctree.obj \
|
||||
gtkfilesel.obj \
|
||||
gtktext.obj \
|
||||
gtktoolbar.obj \
|
||||
gtklist.obj \
|
||||
gtkitemfactory.obj \
|
||||
gtkoptionmenu.obj \
|
||||
gtktree.obj \
|
||||
gtktreeitem.obj \
|
||||
gtkoldeditable.obj \
|
||||
gtklistitem.obj \
|
||||
gtkprogress.obj \
|
||||
gtktipsquery.obj \
|
||||
gtksignal.obj \
|
||||
gtkpixmap.obj \
|
||||
gtkpreview.obj \
|
||||
gtkseparatortoolitem.obj \
|
||||
gtktypeutils.obj \
|
||||
gtktooltips.obj \
|
||||
|
||||
gtk_OBJECTS_cell = \
|
||||
gtkcelleditable.obj \
|
||||
gtkcelllayout.obj \
|
||||
gtkcellrenderer.obj \
|
||||
gtkcellrendereraccel.obj \
|
||||
gtkcellrenderercombo.obj \
|
||||
gtkcellrenderertext.obj \
|
||||
gtkcellrenderertoggle.obj \
|
||||
gtkcellrendererpixbuf.obj \
|
||||
gtkcellrendererprogress.obj \
|
||||
gtkcellrenderertext.obj \
|
||||
gtkcellrenderertoggle.obj \
|
||||
gtkcellrendererpixbuf.obj \
|
||||
gtkcellrendererprogress.obj \
|
||||
gtkcellrendererspin.obj \
|
||||
gtkcellview.obj \
|
||||
gtkcheckbutton.obj \
|
||||
gtkcheckmenuitem.obj \
|
||||
gtkclipboard.obj \
|
||||
gtkclist.obj \
|
||||
gtkcolorbutton.obj \
|
||||
gtkcolorsel.obj \
|
||||
gtkcolorseldialog.obj \
|
||||
gtkcombo.obj \
|
||||
gtkcombobox.obj \
|
||||
gtkcomboboxentry.obj \
|
||||
gtkcontainer.obj \
|
||||
gtkctree.obj \
|
||||
gtkcurve.obj \
|
||||
gtkdialog.obj \
|
||||
gtkdnd.obj \
|
||||
gtkdrawingarea.obj \
|
||||
gtkeditable.obj \
|
||||
gtkentry.obj \
|
||||
gtkentrycompletion.obj \
|
||||
gtkeventbox.obj \
|
||||
gtkexpander.obj \
|
||||
gtkfilechooser.obj \
|
||||
gtkfilechooserbutton.obj \
|
||||
gtkfilechooserdefault.obj \
|
||||
gtkfilechooserdialog.obj \
|
||||
gtkfilechooserembed.obj \
|
||||
gtkfilechooserentry.obj \
|
||||
gtkfilechoosersettings.obj \
|
||||
gtkfilechooserutils.obj \
|
||||
gtkfilechooserwidget.obj \
|
||||
gtkfilefilter.obj \
|
||||
gtkfilesel.obj \
|
||||
gtkfilesystem.obj \
|
||||
gtkfilesystemmodel.obj \
|
||||
gtkfilesystemwin32.obj \
|
||||
gtkfixed.obj \
|
||||
gtkfontsel.obj \
|
||||
gtkfontbutton.obj \
|
||||
gtkframe.obj \
|
||||
gtkgamma.obj \
|
||||
gtkgc.obj \
|
||||
gtkhandlebox.obj \
|
||||
gtkhbbox.obj \
|
||||
gtkhbox.obj \
|
||||
gtkhpaned.obj \
|
||||
gtkhruler.obj \
|
||||
gtkhscale.obj \
|
||||
gtkhscrollbar.obj \
|
||||
gtkhseparator.obj \
|
||||
gtkhsv.obj \
|
||||
gtkiconcache.obj \
|
||||
gtkiconcachevalidator.obj \
|
||||
gtkiconfactory.obj \
|
||||
gtkicontheme.obj \
|
||||
gtkiconview.obj \
|
||||
gtkimage.obj \
|
||||
gtkimagemenuitem.obj \
|
||||
gtkimcontext.obj \
|
||||
gtkimcontextsimple.obj \
|
||||
gtkimmodule.obj \
|
||||
gtkimmulticontext.obj \
|
||||
gtkinputdialog.obj \
|
||||
gtkinvisible.obj \
|
||||
gtkitem.obj \
|
||||
gtkitemfactory.obj \
|
||||
gtkkeyhash.obj \
|
||||
gtklabel.obj \
|
||||
gtklayout.obj \
|
||||
gtklinkbutton.obj \
|
||||
gtklist.obj \
|
||||
gtklistitem.obj \
|
||||
gtkliststore.obj \
|
||||
gtkmain.obj \
|
||||
gtkmarshalers.obj \
|
||||
gtkmarshal.obj \
|
||||
gtkmenu.obj \
|
||||
gtkmenubar.obj \
|
||||
gtkmenuitem.obj \
|
||||
gtkmenushell.obj \
|
||||
gtkmenutoolbutton.obj \
|
||||
gtkmessagedialog.obj \
|
||||
gtkmisc.obj \
|
||||
gtkmnemonichash.obj \
|
||||
gtkmodules.obj \
|
||||
gtknotebook.obj \
|
||||
gtkobject.obj \
|
||||
gtkoldeditable.obj \
|
||||
gtkoptionmenu.obj \
|
||||
gtkpagesetup.obj \
|
||||
gtkpaned.obj \
|
||||
gtkpapersize.obj \
|
||||
gtkpathbar.obj \
|
||||
gtkpixmap.obj \
|
||||
gtkplug.obj \
|
||||
gtkplug-win32.obj \
|
||||
gtkpreview.obj \
|
||||
gtkprint-win32.obj \
|
||||
gtkprintcontext.obj \
|
||||
gtkprintoperation.obj \
|
||||
gtkprintoperationpreview.obj \
|
||||
gtkprintoperation-win32.obj \
|
||||
gtkprintsettings.obj \
|
||||
gtkprintutils.obj \
|
||||
gtkprogress.obj \
|
||||
gtkprogressbar.obj \
|
||||
gtkquery.obj \
|
||||
gtkradioaction.obj \
|
||||
gtkradiobutton.obj \
|
||||
gtkradiotoolbutton.obj \
|
||||
gtkradiomenuitem.obj \
|
||||
gtkrange.obj \
|
||||
gtkrbtree.obj \
|
||||
gtkrc.obj \
|
||||
gtkcellview.obj \
|
||||
gtkliststore.obj \
|
||||
gtktreednd.obj \
|
||||
gtktreemodel.obj \
|
||||
gtktreemodelfilter.obj \
|
||||
gtktreemodelsort.obj \
|
||||
gtktreeselection.obj \
|
||||
gtktreesortable.obj \
|
||||
gtktreestore.obj \
|
||||
gtktreeview.obj \
|
||||
gtktreeviewcolumn.obj \
|
||||
|
||||
gtk_OBJECTS_file = \
|
||||
gtkfilechooser.obj \
|
||||
gtkfilechooserbutton.obj \
|
||||
gtkfilechooserdefault.obj \
|
||||
gtkfilechooserdialog.obj \
|
||||
gtkfilechooserembed.obj \
|
||||
gtkfilechooserentry.obj \
|
||||
gtkfilechoosersettings.obj \
|
||||
gtkfilechooserutils.obj \
|
||||
gtkfilechooserwidget.obj \
|
||||
gtkfilefilter.obj \
|
||||
gtkfilesystem.obj \
|
||||
gtkfilesystemmodel.obj \
|
||||
gtkfilesystemwin32.obj \
|
||||
|
||||
gtk_OBJECTS_print = \
|
||||
gtkprint-win32.obj \
|
||||
gtkprintcontext.obj \
|
||||
gtkprintoperation.obj \
|
||||
gtkprintoperationpreview.obj \
|
||||
gtkprintoperation-win32.obj \
|
||||
gtkprintsettings.obj \
|
||||
gtkprintutils.obj \
|
||||
|
||||
gtk_OBJECTS_text = \
|
||||
gtktestutils.obj \
|
||||
gtktextbtree.obj \
|
||||
gtktextbuffer.obj \
|
||||
gtktextbufferrichtext.obj \
|
||||
gtktextbufferserialize.obj \
|
||||
gtktextchild.obj \
|
||||
gtktextdisplay.obj \
|
||||
gtktextiter.obj \
|
||||
gtktextlayout.obj \
|
||||
gtktextmark.obj \
|
||||
gtktextsegment.obj \
|
||||
gtktexttag.obj \
|
||||
gtktexttagtable.obj \
|
||||
gtktexttypes.obj \
|
||||
gtktextutil.obj \
|
||||
gtktextview.obj \
|
||||
|
||||
gtk_OBJECTS_recent = \
|
||||
gtkrecentaction.obj \
|
||||
gtkrecentchooserdefault.obj \
|
||||
gtkrecentchooserdialog.obj \
|
||||
gtkrecentchoosermenu.obj \
|
||||
gtkrecentchoosermenu.obj \
|
||||
gtkrecentchooserwidget.obj \
|
||||
gtkrecentchooserutils.obj \
|
||||
gtkrecentchooser.obj \
|
||||
gtkrecentfilter.obj \
|
||||
gtkrecentmanager.obj \
|
||||
gtkruler.obj \
|
||||
gtkscale.obj \
|
||||
gtkscalebutton.obj \
|
||||
gtkscrollbar.obj \
|
||||
gtkscrolledwindow.obj \
|
||||
gtksearchengine.obj \
|
||||
gtksearchenginebeagle.obj \
|
||||
gtksearchenginesimple.obj \
|
||||
gtksearchenginetracker.obj \
|
||||
gtkselection.obj \
|
||||
gtkseparator.obj \
|
||||
gtkrecentchooser.obj \
|
||||
gtkrecentfilter.obj \
|
||||
gtkrecentmanager.obj \
|
||||
|
||||
gtk_OBJECTS = \
|
||||
fnmatch.obj \
|
||||
gtkaboutdialog.obj \
|
||||
gtkaccelgroup.obj \
|
||||
gtkaccellabel.obj \
|
||||
gtkaccelmap.obj \
|
||||
gtkaccessible.obj \
|
||||
gtkaction.obj \
|
||||
gtkactiongroup.obj \
|
||||
gtkadjustment.obj \
|
||||
gtkalignment.obj \
|
||||
gtkarrow.obj \
|
||||
gtkaspectframe.obj \
|
||||
gtkassistant.obj \
|
||||
gtkbin.obj \
|
||||
gtkbindings.obj \
|
||||
gtkbbox.obj \
|
||||
gtkbox.obj \
|
||||
gtkbuildable.obj \
|
||||
gtkbuilder.obj \
|
||||
gtkbuilderparser.obj \
|
||||
gtkbutton.obj \
|
||||
gtkcalendar.obj \
|
||||
gtkcheckbutton.obj \
|
||||
gtkcheckmenuitem.obj \
|
||||
gtkclipboard.obj \
|
||||
gtkcolorbutton.obj \
|
||||
gtkcolorsel.obj \
|
||||
gtkcolorseldialog.obj \
|
||||
gtkcombobox.obj \
|
||||
gtkcomboboxentry.obj \
|
||||
gtkcontainer.obj \
|
||||
gtkcurve.obj \
|
||||
gtkdialog.obj \
|
||||
gtkdnd.obj \
|
||||
gtkdrawingarea.obj \
|
||||
gtkeditable.obj \
|
||||
gtkentry.obj \
|
||||
gtkentrycompletion.obj \
|
||||
gtkeventbox.obj \
|
||||
gtkexpander.obj \
|
||||
gtkfixed.obj \
|
||||
gtkfontsel.obj \
|
||||
gtkfontbutton.obj \
|
||||
gtkframe.obj \
|
||||
gtkgamma.obj \
|
||||
gtkgc.obj \
|
||||
gtkhandlebox.obj \
|
||||
gtkhbbox.obj \
|
||||
gtkhbox.obj \
|
||||
gtkhpaned.obj \
|
||||
gtkhruler.obj \
|
||||
gtkhscale.obj \
|
||||
gtkhscrollbar.obj \
|
||||
gtkhseparator.obj \
|
||||
gtkhsv.obj \
|
||||
gtkiconcache.obj \
|
||||
gtkiconcachevalidator.obj \
|
||||
gtkiconfactory.obj \
|
||||
gtkicontheme.obj \
|
||||
gtkiconview.obj \
|
||||
gtkimage.obj \
|
||||
gtkimagemenuitem.obj \
|
||||
gtkimcontext.obj \
|
||||
gtkimcontextsimple.obj \
|
||||
gtkimmodule.obj \
|
||||
gtkimmulticontext.obj \
|
||||
gtkinputdialog.obj \
|
||||
gtkinvisible.obj \
|
||||
gtkitem.obj \
|
||||
gtkkeyhash.obj \
|
||||
gtklabel.obj \
|
||||
gtklayout.obj \
|
||||
gtklinkbutton.obj \
|
||||
gtkmain.obj \
|
||||
gtkmarshalers.obj \
|
||||
gtkmarshal.obj \
|
||||
gtkmenu.obj \
|
||||
gtkmenubar.obj \
|
||||
gtkmenuitem.obj \
|
||||
gtkmenushell.obj \
|
||||
gtkmenutoolbutton.obj \
|
||||
gtkmessagedialog.obj \
|
||||
gtkmisc.obj \
|
||||
gtkmnemonichash.obj \
|
||||
gtkmodules.obj \
|
||||
gtkmountoperation.obj \
|
||||
gtknotebook.obj \
|
||||
gtkobject.obj \
|
||||
gtkpagesetup.obj \
|
||||
gtkpaned.obj \
|
||||
gtkpapersize.obj \
|
||||
gtkpathbar.obj \
|
||||
gtkplug.obj \
|
||||
gtkplug-win32.obj \
|
||||
gtkprogressbar.obj \
|
||||
gtkquery.obj \
|
||||
gtkradioaction.obj \
|
||||
gtkradiobutton.obj \
|
||||
gtkradiotoolbutton.obj \
|
||||
gtkradiomenuitem.obj \
|
||||
gtkrange.obj \
|
||||
gtkrbtree.obj \
|
||||
gtkrc.obj \
|
||||
gtkruler.obj \
|
||||
gtkscale.obj \
|
||||
gtkscalebutton.obj \
|
||||
gtkscrollbar.obj \
|
||||
gtkscrolledwindow.obj \
|
||||
gtksearchengine.obj \
|
||||
gtksearchenginebeagle.obj \
|
||||
gtksearchenginesimple.obj \
|
||||
gtksearchenginetracker.obj \
|
||||
gtkselection.obj \
|
||||
gtkseparator.obj \
|
||||
gtkseparatormenuitem.obj \
|
||||
gtkseparatortoolitem.obj \
|
||||
gtksettings.obj \
|
||||
gtksignal.obj \
|
||||
gtksizegroup.obj \
|
||||
gtksocket.obj \
|
||||
gtksocket-win32.obj \
|
||||
gtkspinbutton.obj \
|
||||
gtkstatusicon.obj \
|
||||
gtkstyle.obj \
|
||||
gtkstatusbar.obj \
|
||||
gtkstock.obj \
|
||||
gtktable.obj \
|
||||
gtktearoffmenuitem.obj \
|
||||
gtktext.obj \
|
||||
gtktextbtree.obj \
|
||||
gtktextbuffer.obj \
|
||||
gtktextbufferrichtext.obj \
|
||||
gtktextbufferserialize.obj \
|
||||
gtktextchild.obj \
|
||||
gtktextdisplay.obj \
|
||||
gtktextiter.obj \
|
||||
gtktextlayout.obj \
|
||||
gtktextmark.obj \
|
||||
gtktextsegment.obj \
|
||||
gtktexttag.obj \
|
||||
gtktexttagtable.obj \
|
||||
gtktexttypes.obj \
|
||||
gtktextutil.obj \
|
||||
gtktextview.obj \
|
||||
gtkthemes.obj \
|
||||
gtktipsquery.obj \
|
||||
gtktoggleaction.obj \
|
||||
gtktogglebutton.obj \
|
||||
gtktoggletoolbutton.obj \
|
||||
gtktoolbar.obj \
|
||||
gtktoolbutton.obj \
|
||||
gtktoolitem.obj \
|
||||
gtktooltip.obj \
|
||||
gtktooltips.obj \
|
||||
gtktrayicon-win32.obj \
|
||||
gtktree.obj \
|
||||
gtktreedatalist.obj \
|
||||
gtktreednd.obj \
|
||||
gtktreeitem.obj \
|
||||
gtktreemodel.obj \
|
||||
gtktreemodelfilter.obj \
|
||||
gtktreemodelsort.obj \
|
||||
gtktreeselection.obj \
|
||||
gtktreesortable.obj \
|
||||
gtktreestore.obj \
|
||||
gtktreeview.obj \
|
||||
gtktreeviewcolumn.obj \
|
||||
gtktypeutils.obj \
|
||||
gtksocket.obj \
|
||||
gtksocket-win32.obj \
|
||||
gtkspinbutton.obj \
|
||||
gtkstatusicon.obj \
|
||||
gtkstyle.obj \
|
||||
gtkstatusbar.obj \
|
||||
gtkstock.obj \
|
||||
gtktable.obj \
|
||||
gtktearoffmenuitem.obj \
|
||||
gtkthemes.obj \
|
||||
gtktoggleaction.obj \
|
||||
gtktogglebutton.obj \
|
||||
gtktoggletoolbutton.obj \
|
||||
gtktoolbutton.obj \
|
||||
gtktoolitem.obj \
|
||||
gtktoolshell.obj \
|
||||
gtktooltip.obj \
|
||||
gtktreedatalist.obj \
|
||||
gtktypebuiltins.obj \
|
||||
gtkuimanager.obj \
|
||||
gtkvbbox.obj \
|
||||
gtkvbox.obj \
|
||||
gtkviewport.obj \
|
||||
gtkvolumebutton.obj \
|
||||
gtkvpaned.obj \
|
||||
gtkvruler.obj \
|
||||
gtkvscale.obj \
|
||||
gtkvscrollbar.obj \
|
||||
gtkvseparator.obj \
|
||||
gtkwidget.obj \
|
||||
gtkwin32embed.obj \
|
||||
gtkwin32embedwidget.obj \
|
||||
gtkwindow.obj \
|
||||
gtkuimanager.obj \
|
||||
gtkvbbox.obj \
|
||||
gtkvbox.obj \
|
||||
gtkviewport.obj \
|
||||
gtkvolumebutton.obj \
|
||||
gtkvpaned.obj \
|
||||
gtkvruler.obj \
|
||||
gtkvscale.obj \
|
||||
gtkvscrollbar.obj \
|
||||
gtkvseparator.obj \
|
||||
gtkwidget.obj \
|
||||
gtkwin32embed.obj \
|
||||
gtkwin32embedwidget.obj \
|
||||
gtkwindow.obj \
|
||||
gtkwindow-decorate.obj
|
||||
|
||||
# Source headers which are non-autogenerated headers
|
||||
@ -428,6 +442,7 @@ gtk_public_h_sources = \
|
||||
gtkmessagedialog.h \
|
||||
gtkmisc.h \
|
||||
gtkmodules.h \
|
||||
gtkmountoperation.h \
|
||||
gtknotebook.h \
|
||||
gtkobject.h \
|
||||
gtkoldeditable.h \
|
||||
@ -582,17 +597,51 @@ gtkmarshal.h : gtkmarshal.list
|
||||
gtkmarshal.c : gtkmarshal.list
|
||||
$(GLIB)\gobject\glib-genmarshal --prefix=gtk_marshal gtkmarshal.list --body >gtkmarshal.c
|
||||
|
||||
gtktypefuncs.c : makefile.msc
|
||||
echo /*none*/ > gtktypefuncs.c
|
||||
gtksignal.obj : gtksignal.c gtkmarshal.c gtkmarshal.h
|
||||
$(CC) $(CFLAGS) -GD -c -DGTK_COMPILATION -DG_LOG_DOMAIN=\"Gtk\" gtksignal.c
|
||||
|
||||
gtk-win32.res : gtk-win32.rc
|
||||
rc -DBUILDNUMBER=0 -r -fo gtk-win32.res gtk-win32.rc
|
||||
|
||||
# build some static limits to covercome command line too long
|
||||
# may also speed up the build
|
||||
gtk-deprecated.lib : $(gtk_OBJECTS_deprecated)
|
||||
lib /out:gtk-deprecated.lib $(gtk_OBJECTS_deprecated)
|
||||
|
||||
gtk-cell.lib : $(gtk_OBJECTS_cell)
|
||||
lib /out:gtk-cell.lib $(gtk_OBJECTS_cell)
|
||||
|
||||
gtk-file.lib : $(gtk_OBJECTS_file)
|
||||
lib /out:gtk-file.lib $(gtk_OBJECTS_file)
|
||||
|
||||
gtk-print.lib : $(gtk_OBJECTS_print)
|
||||
lib /out:gtk-print.lib $(gtk_OBJECTS_print)
|
||||
|
||||
gtk-recent.lib : $(gtk_OBJECTS_recent)
|
||||
lib /out:gtk-recent.lib $(gtk_OBJECTS_recent)
|
||||
|
||||
gtk-text.lib : $(gtk_OBJECTS_text)
|
||||
lib /out:gtk-text.lib $(gtk_OBJECTS_text)
|
||||
|
||||
gtk-core.lib : $(gtk_OBJECTS)
|
||||
lib /out:gtk-core.lib $(gtk_OBJECTS)
|
||||
|
||||
gtk_SUBLIBS = \
|
||||
gtk-deprecated.lib \
|
||||
gtk-cell.lib \
|
||||
gtk-file.lib \
|
||||
gtk-print.lib \
|
||||
gtk-recent.lib \
|
||||
gtk-text.lib \
|
||||
gtk-core.lib
|
||||
|
||||
#
|
||||
# Linking:
|
||||
#
|
||||
libgtk-win32-$(GTK_VER)-0.dll : $(gtk_OBJECTS) gtk.def gtk-win32.res
|
||||
$(CC) $(CFLAGS) -LD -Fm -Fe$@ $(gtk_OBJECTS) gtk-win32.res \
|
||||
libgtk-win32-$(GTK_VER)-0.dll : $(gtk_SUBLIBS) gtk.def gtk-win32.res
|
||||
$(CC) $(CFLAGS) -LD -Fm -Fe$@ $(gtk_SUBLIBS) gtk-win32.res \
|
||||
$(GDK_LIBS) $(GDK_PIXBUF_LIBS) $(PANGO_LIBS) $(INTL_LIBS) $(GLIB_LIBS) $(GMODULE_LIBS) \
|
||||
$(CAIRO_LIBS) $(PANGOCAIRO_LIBS) \
|
||||
gdi32.lib user32.lib advapi32.lib wsock32.lib shell32.lib ole32.lib comdlg32.lib winspool.lib comctl32.lib \
|
||||
|
||||
@ -55,7 +55,7 @@ TESTAPPS = \
|
||||
testprint \
|
||||
testrecentchooser testrecentchoosermenu testrgb testrichtext \
|
||||
testselection testspinbutton \
|
||||
testtext testtextbuffer testtoolbar testtooltips \
|
||||
testtext textbuffertest testtoolbar testtooltips \
|
||||
testtreecolumns testtreeedit testtreeflow testtreefocus \
|
||||
testtreemodel testtreesort testtreeview treestoretest \
|
||||
testsocket testsocket_child teststatusicon \
|
||||
@ -76,6 +76,9 @@ one-test-app:
|
||||
|
||||
EXTRA_OBJETCS = prop-editor.obj
|
||||
|
||||
!IFDEF EXTRA_buildertest
|
||||
EXTRA_LIBS = $(ATK_LIBS)
|
||||
!ENDIF
|
||||
|
||||
!IFDEF EXTRA_testprint
|
||||
EXTRA_OBJETCS = testprintfileoperation.obj
|
||||
|
||||
Loading…
Reference in New Issue
Block a user