## There is no install target, you have to decide where and
## how to install for yourself.
-TOP = ../..
-!INCLUDE $(TOP)/build/win32/make.msc
+TOP = ..\..
+!INCLUDE $(TOP)/glib/build/win32/make.msc
################################################################
GTK_VER = @GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@
GDK_PIXBUF_VER = @GDK_PIXBUF_MAJOR@.@GDK_PIXBUF_MINOR@
+
GDK_LIBS = ../gdk/gdk-win32-$(GTK_VER).lib
GTK_LIBS = gtk-win32-$(GTK_VER).lib
GDK_PIXBUF_LIBS = ../gdk-pixbuf/gdk_pixbuf-$(GDK_PIXBUF_VER).lib
+GTK_BINARY_VERSION = @GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.@LT_CURRENT@
# Perl and awk are needed to generate some source files.
# These generated source files are distribuyted with the Win32 GTk+ source
PERL = perl
AWK = gawk
-INCLUDES = -I . -I .. -I ../gdk -I ../gdk-pixbuf
-DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) $(INTL_CFLAGS)
-LDFLAGS = /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)
+LDFLAGS = $(ATK_LIBS) /link /machine:ix86 $(LINKDEBUG)
# Some files use near as an identifier
-DEFINES = -DGTK_DISABLE_COMPAT_H -DGTK_COMPILATION -DG_LOG_DOMAIN=\"Gtk\" -Dnear=xxnear
+# Don't define GTK_COMPILATION here, because it's for gtk-x.x.dll only
+DEFINES = $(G_DEBUGGING) -DGTK_DISABLE_COMPAT_H -DG_LOG_DOMAIN=\"Gtk\" -Dnear=xxnear \
+ -DGTK_VERSION=\"$(GTK_VER)\" -DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\"
TOUCH = copy makefile.msc+nul
-GTK_VER=1.3
+gtk-stocks-icons :
+ cd stock-icons
+ nmake -nologo -f makefile.msc
+ cd ..
all : \
..\config.h \
- gtkcompat.h \
generated \
+ gtk-stocks-icons \
gtk-win32-$(GTK_VER).dll \
- testcalendar.exe \
- testdnd.exe \
- testgtk.exe \
- testinput.exe \
- testrgb.exe \
- testselection.exe \
- testtext.exe \
- testtextbuffer.exe \
- simple.exe
+ gtk-query-immodules-$(GTK_VER).exe \
+# gtk-win32-$(GTK_VER)s.lib \
+# gtk-x11-$(GTK_VER).dll
gtk_OBJECTS = \
fnmatch.obj \
- gdk-pixbuf-loader.obj \
gtkaccelgroup.obj \
gtkaccellabel.obj \
+ gtkaccelmap.obj \
+ gtkaccessible.obj \
gtkadjustment.obj \
gtkalignment.obj \
- gtkarg.obj \
gtkarrow.obj \
gtkaspectframe.obj \
gtkbin.obj \
gtkbox.obj \
gtkbutton.obj \
gtkcalendar.obj \
+ gtkcelleditable.obj \
+ gtkcellrenderer.obj \
+ gtkcellrenderertext.obj \
+ gtkcellrenderertoggle.obj \
+ gtkcellrendererpixbuf.obj \
gtkcheckbutton.obj \
gtkcheckmenuitem.obj \
gtkclipboard.obj \
gtkcontainer.obj \
gtkctree.obj \
gtkcurve.obj \
- gtkdata.obj \
gtkdialog.obj \
gtkdnd.obj \
gtkdrawingarea.obj \
gtkhsv.obj \
gtkiconfactory.obj \
gtkimage.obj \
+ gtkimagemenuitem.obj \
gtkimcontext.obj \
gtkimcontextsimple.obj \
+ gtkimmodule.obj \
gtkimmulticontext.obj \
gtkinputdialog.obj \
gtkinvisible.obj \
gtklayout.obj \
gtklist.obj \
gtklistitem.obj \
+ gtkliststore.obj \
gtkmain.obj \
+ gtkmarshalers.obj \
+ gtkmarshal.obj \
gtkmenu.obj \
gtkmenubar.obj \
- gtkmenufactory.obj \
gtkmenuitem.obj \
gtkmenushell.obj \
gtkmessagedialog.obj \
gtkmisc.obj \
gtknotebook.obj \
gtkobject.obj \
+ gtkoldeditable.obj \
gtkoptionmenu.obj \
- gtkpacker.obj \
gtkpaned.obj \
gtkpixmap.obj \
gtkplug.obj \
gtkradiobutton.obj \
gtkradiomenuitem.obj \
gtkrange.obj \
+ gtkrbtree.obj \
gtkrc.obj \
gtkruler.obj \
gtkscale.obj \
gtkscrolledwindow.obj \
gtkselection.obj \
gtkseparator.obj \
+ gtkseparatormenuitem.obj \
+ gtksettings.obj \
gtksignal.obj \
+ gtksizegroup.obj \
gtksocket.obj \
gtkspinbutton.obj \
gtkstyle.obj \
gtktoolbar.obj \
gtktooltips.obj \
gtktree.obj \
+ gtktreedatalist.obj \
+ gtktreednd.obj \
gtktreeitem.obj \
+ gtktreemodel.obj \
+ gtktreemodelsort.obj \
+ gtktreeselection.obj \
+ gtktreesortable.obj \
+ gtktreestore.obj \
+ gtktreeview.obj \
+ gtktreeviewcolumn.obj \
gtktypeutils.obj \
gtkvbbox.obj \
gtkvbox.obj \
gtkvscrollbar.obj \
gtkvseparator.obj \
gtkwidget.obj \
- gtkwindow.obj
+ gtkwindow.obj \
+ gtkwindow-decorate.obj
# Source headers which are non-autogenerated headers
gtk_public_h_sources = \
gtk.h \
gtkaccelgroup.h \
gtkaccellabel.h \
+ gtkaccessible.h \
gtkadjustment.h \
gtkalignment.h \
- gtkarg.h \
gtkarrow.h \
gtkaspectframe.h \
gtkbin.h \
gtkcolorsel.h \
gtkcolorseldialog.h \
gtkcombo.h \
- gtkcompat.h \
gtkcontainer.h \
gtkctree.h \
gtkcurve.h \
+ gtkcelleditable.h \
gtkcellrenderer.h \
gtkcellrenderertext.h \
- gtkcellrenderertextpixbuf.h \
gtkcellrenderertoggle.h \
gtkcellrendererpixbuf.h \
- gtkdata.h \
gtkdebug.h \
gtkdialog.h \
gtkdnd.h \
gtkiconfactory.h \
gtkimage.h \
gtkimcontext.h \
+ gtkimmodule.h \
gtkimmulticontext.h \
gtkinputdialog.h \
gtkinvisible.h \
gtklistitem.h \
gtkliststore.h \
gtkmain.h \
+ gtkmarshal.h \
gtkmenu.h \
gtkmenubar.h \
- gtkmenufactory.h \
gtkmenuitem.h \
gtkmenushell.h \
gtkmessagedialog.h \
gtkmisc.h \
- gtkmodelsimple.h \
gtknotebook.h \
+ gtkoldeditable.h \
gtkobject.h \
gtkoptionmenu.h \
- gtkpacker.h \
gtkpaned.h \
- gdk-pixbuf-loader.h \
gtkpixmap.h \
gtkplug.h \
gtkpreview.h \
gtkscrolledwindow.h \
gtkselection.h \
gtkseparator.h \
+ gtksizegroup.h \
gtksignal.h \
gtksocket.h \
gtkspinbutton.h \
gtktexttagtable.h \
gtktextview.h \
gtktext.h \
- gtkthemes.h \
gtktipsquery.h \
gtktogglebutton.h \
gtktoolbar.h \
gtktree.h \
gtktreeitem.h \
gtktreemodel.h \
+ gtktreemodelsort.h \
gtktreeselection.h \
+ gtktreesortable.h \
gtktreestore.h \
gtktreeview.h \
gtktreeviewcolumn.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
+# these aren't use here, but listed for reference
+gtk_extra_sources = \
+ gtkversion.h \
+ maketypes.awk \
+ makeenums.h \
+ gtk-boxed.defs \
+ gtkmarshal.list \
..\config.h : ..\config.h.win32
copy ..\config.h.win32 ..\config.h
-gtkcompat.h : gtkcompat.h.win32
- copy gtkcompat.h.win32 gtkcompat.h
-
-GENERATED = gtk.defs gtktypebuiltins.h gtktypebuiltins_vars.c gtktypebuiltins_ids.c gtktypebuiltins_evals.c gtkmarshal.h gtkmarshal.c
+GENERATED = gtk.defs gtktypebuiltins.h gtktypebuiltins_vars.c gtktypebuiltins_ids.c gtktypebuiltins_evals.c gtkmarshal.h gtkmarshal.c gtkmarshalers.h gtkmarshalers.c
#
# Generated source files:
generated : $(GENERATED)
$(TOUCH) generated
-gtk.defs : makeenums.pl gtk-boxed.defs $(gtk_public_h_sources) $(gdk_headers)
- $(PERL) makeenums.pl defs $(gtk_public_h_sources) $(gdk_headers) >gd.tmp
+gtk.defs : makeenums.pl gtk-boxed.defs $(gtk_public_h_sources) makefile.msc
+ $(PERL) makeenums.pl defs $(gtk_public_h_sources) >gd.tmp
copy gd.tmp+gtk-boxed.defs gtk.defs
@erase gd.tmp
gtktypebuiltins_evals.c: makeenums.pl gtk.defs
$(PERL) makeenums.pl arrays $(gtk_public_h_sources) $(gdk_headers) >gtktypebuiltins_evals.c
-gtkmarshal.h gtkmarshal.c : gtkmarshal.list genmarshal.pl
- $(PERL) genmarshal.pl gtkmarshal.list s-gmh s-gmc
- del gtkmarshal.c
- rename s-gmc gtkmarshal.c
- del gtkmarshal.h
- rename s-gmh gtkmarshal.h
-
-#
-# Linking:
-#
-gtk-win32-$(GTK_VER).dll : $(gtk_OBJECTS) gtk.def
- $(CC) $(CFLAGS) -LD -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
-
-# General rule for compiling the objects into the DLL
-.c.obj :
- $(CC) $(CFLAGS) -GD -c -DGTK_COMPILATION -DG_LOG_DOMAIN=\"Gtk\" $<
-
-#
-# Test programs:
-#
-testcalendar.exe : gtk-win32-$(GTK_VER).dll testcalendar.obj
- $(CC) $(CFLAGS) testcalendar.obj $(GTK_LIBS) $(GDK_LIBS) $(PANGO_LIBS) $(GLIB_LIBS) $(LDFLAGS)
-
-# Must have separate rules for these objects that don't go in the DLL
-testcalendar.obj : testcalendar.c
- $(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testcalendar\" testcalendar.c
+# private marshalers
+gtkmarshalers.h : gtkmarshalers.list
+ $(GLIB)\gobject\glib-genmarshal --prefix=_gtk_marshal gtkmarshalers.list --header >>gtkmarshalers.h
-testdnd.exe : gtk-win32-$(GTK_VER).dll testdnd.obj
- $(CC) $(CFLAGS) testdnd.obj $(GTK_LIBS) $(GDK_LIBS) $(GLIB_LIBS) $(LDFLAGS)
+gtkmarshalers.c : gtkmarshalers.list
+ $(GLIB)\gobject\glib-genmarshal --prefix=_gtk_marshal gtkmarshalers.list --body >gtkmarshalers.c
-testdnd.obj : testdnd.c
- $(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testdnd\" testdnd.c
+# public, deprecated marshalers
+gtkmarshal.h : gtkmarshal.list
+ echo #ifndef GTK_DISABLE_DEPRECATED >gtkmarshal.h
+ $(GLIB)\gobject\glib-genmarshal --prefix=gtk_marshal gtkmarshal.list --header >>gtkmarshal.h
+ echo #endif /* GTK_DISABLE_DEPRECATED */ >>gtkmarshal.h
-testgtk.exe : gtk-win32-$(GTK_VER).dll testgtk.obj
- $(CC) $(CFLAGS) testgtk.obj $(GTK_LIBS) $(GDK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(LDFLAGS)
+gtkmarshal.c : gtkmarshal.list
+ $(GLIB)\gobject\glib-genmarshal --prefix=gtk_marshal gtkmarshal.list --body >gtkmarshal.c
-testgtk.obj : testgtk.c
- $(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testgtk\" testgtk.c
+gtksignal.obj : gtksignal.c gtkmarshal.c gtkmarshal.h
+ $(CC) $(CFLAGS) -GD -c -DGTK_COMPILATION -DG_LOG_DOMAIN=\"Gtk\" gtksignal.c
-testinput.exe : gtk-win32-$(GTK_VER).dll testinput.obj
- $(CC) $(CFLAGS) testinput.obj $(GTK_LIBS) $(GDK_LIBS) $(GLIB_LIBS) $(LDFLAGS)
-
-testinput.obj : testinput.c
- $(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testinput\" testinput.c
-
-testrgb.exe : gtk-win32-$(GTK_VER).dll testrgb.obj
- $(CC) $(CFLAGS) testrgb.obj $(GTK_LIBS) $(GDK_LIBS) $(GLIB_LIBS) $(LDFLAGS)
-
-testrgb.obj : testrgb.c
- $(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testrgb\" testrgb.c
-
-testselection.exe : gtk-win32-$(GTK_VER).dll testselection.obj
- $(CC) $(CFLAGS) testselection.obj $(GTK_LIBS) $(GDK_LIBS) $(GLIB_LIBS) $(LDFLAGS)
-
-testselection.obj : testselection.c
- $(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testselection\" testselection.c
-
-testtext.exe : gtk-win32-$(GTK_VER).dll testtext.obj
- $(CC) $(CFLAGS) testtext.obj $(PANGO_LIBS) $(GDK_PIXBUF_LIBS) $(GTK_LIBS) $(GDK_LIBS) $(GLIB_LIBS) $(LDFLAGS)
-
-testtext.obj : testtext.c
- $(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testtext\" testtext.c
+#
+# 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 wsock32.lib $(LDFLAGS) /def:gtk.def
-testtextbuffer.exe : gtk-win32-$(GTK_VER).dll testtextbuffer.obj
- $(CC) $(CFLAGS) testtextbuffer.obj $(GDK_PIXBUF_LIBS) $(GTK_LIBS) $(GDK_LIBS) $(GLIB_LIBS) $(LDFLAGS)
+gtk-win32-$(GTK_VER)s.lib : $(gtk_OBJECTS)
+ lib /out:gtk-win32-$(GTK_VER)s.lib $(gtk_OBJECTS)
-testtextbuffer.obj : testtextbuffer.c
- $(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testtextbuffer\" testtextbuffer.c
+gtk-query-immodules-$(GTK_VER).exe : queryimmodules.obj
+ $(CC) $(CFLAGS) -Fe$@ queryimmodules.obj $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(LDFLAGS)
-testthreads.exe : gtk-win32-$(GTK_VER).dll testthreads.obj
- $(CC) $(CFLAGS) testthreads.obj $(GTK_LIBS) $(GDK_LIBS) $(GLIB_LIBS) $(PTHREAD_LIBS) $(LDFLAGS)
+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
-testthreads.obj : testthreads.c
- $(CC) $(CFLAGS) $(PTHREAD_CFLAGS) -c -DG_LOG_DOMAIN=\"testthreads\" -DUSE_PTHREADS=1 testthreads.c
+# General rule for compiling the objects into the DLL
+.c.obj :
+ $(CC) $(CFLAGS) -GD -c -DGTK_COMPILATION -DG_LOG_DOMAIN=\"Gtk\" $<
-simple.exe : gtk-win32-$(GTK_VER).dll simple.obj
- $(CC) $(CFLAGS) simple.obj $(GTK_LIBS) $(GDK_LIBS) $(GLIB_LIBS) $(LDFLAGS)
+$(EXAMPLE).obj : ..\examples\$(EXAMPLE)\$(EXAMPLE).c
+ $(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"$(EXAMPLE)\" ..\examples\$(EXAMPLE)\$(EXAMPLE).c
-simple.obj : simple.c
- $(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"simple\" simple.c
+$(EXAMPLE).exe : $(EXAMPLE).obj
+ $(CC) $(CFLAGS) $(EXAMPLE).obj $(GTK_LIBS) $(GDK_LIBS) $(GLIB_LIBS) $(LDFLAGS)
makefile.msc: makefile.msc.in
sed -e s,@GTK[_]MAJOR_VERSION@,@GTK_MAJOR_VERSION@, \
-e s,@GTK[_]MINOR_VERSION@,@GTK_MINOR_VERSION@, \
+ -e 's,@GTK[_]VERSION@,@GTK_VERSION@,' \
-e 's,@GDK_PIXBUF[_]MAJOR@,@GDK_PIXBUF_MAJOR@,' \
-e 's,@GDK_PIXBUF[_]MINOR@,@GDK_PIXBUF_MINOR@,' <makefile.msc.in >$@
projects / ~andy / gtk / blobdiff