]> Pileus Git - ~andy/gtk/blobdiff - gtk/makefile.msc.in
make it compile with msvc: !HAVE_UNISTD_H; no label without op, even if
[~andy/gtk] / gtk / makefile.msc.in
index fea06f760077efaf154cd66a8a320f6d809f1c54..965dd6e9e8bfa42be0c0374098df598c2ed0aab4 100644 (file)
@@ -4,8 +4,8 @@
 ## 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
 
 ################################################################
 
@@ -13,9 +13,11 @@ TOP = ../..
 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
@@ -23,39 +25,39 @@ 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)
-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
 # Don't define GTK_COMPILATION here, because it's for gtk-x.x.dll only
-DEFINES = -DGTK_DISABLE_COMPAT_H -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)\" -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                             \
        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                              \
@@ -64,9 +66,9 @@ gtk_OBJECTS =                                         \
        gtkbox.obj                              \
        gtkbutton.obj                           \
        gtkcalendar.obj                         \
+       gtkcelleditable.obj                     \
        gtkcellrenderer.obj                     \
        gtkcellrenderertext.obj                 \
-       gtkcellrenderertextpixbuf.obj           \
        gtkcellrenderertoggle.obj               \
        gtkcellrendererpixbuf.obj               \
        gtkcheckbutton.obj                      \
@@ -79,7 +81,6 @@ gtk_OBJECTS =                                         \
        gtkcontainer.obj                        \
        gtkctree.obj                            \
        gtkcurve.obj                            \
-       gtkdata.obj                             \
        gtkdialog.obj                           \
        gtkdnd.obj                              \
        gtkdrawingarea.obj                      \
@@ -116,10 +117,12 @@ gtk_OBJECTS =                                     \
        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                    \
@@ -128,7 +131,6 @@ gtk_OBJECTS =                                       \
        gtkobject.obj                           \
        gtkoldeditable.obj                      \
        gtkoptionmenu.obj                       \
-       gtkpacker.obj                           \
        gtkpaned.obj                            \
        gtkpixmap.obj                           \
        gtkplug.obj                             \
@@ -147,7 +149,9 @@ gtk_OBJECTS =                                       \
        gtkselection.obj                        \
        gtkseparator.obj                        \
        gtkseparatormenuitem.obj \
+       gtksettings.obj \
        gtksignal.obj                           \
+       gtksizegroup.obj \
        gtksocket.obj                           \
        gtkspinbutton.obj                       \
        gtkstyle.obj                            \
@@ -178,9 +182,9 @@ gtk_OBJECTS =                                       \
        gtktreednd.obj                          \
        gtktreeitem.obj                         \
        gtktreemodel.obj                        \
-       gtktreemodelsimple.obj                  \
        gtktreemodelsort.obj                    \
        gtktreeselection.obj                    \
+       gtktreesortable.obj \
        gtktreestore.obj                        \
        gtktreeview.obj                 \
        gtktreeviewcolumn.obj                   \
@@ -202,9 +206,9 @@ gtk_public_h_sources =              \
        gtk.h                   \
        gtkaccelgroup.h         \
        gtkaccellabel.h         \
+       gtkaccessible.h \
        gtkadjustment.h         \
        gtkalignment.h          \
-       gtkarg.h                \
        gtkarrow.h              \
        gtkaspectframe.h        \
        gtkbin.h                \
@@ -220,16 +224,14 @@ gtk_public_h_sources =            \
        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                \
@@ -268,9 +270,9 @@ gtk_public_h_sources =              \
        gtklistitem.h           \
        gtkliststore.h          \
        gtkmain.h               \
+       gtkmarshal.h    \
        gtkmenu.h               \
        gtkmenubar.h            \
-       gtkmenufactory.h        \
        gtkmenuitem.h           \
        gtkmenushell.h          \
        gtkmessagedialog.h      \
@@ -279,9 +281,7 @@ gtk_public_h_sources =              \
        gtkoldeditable.h        \
        gtkobject.h             \
        gtkoptionmenu.h         \
-       gtkpacker.h             \
        gtkpaned.h              \
-#      gdk-pixbuf-loader.h     \
        gtkpixmap.h             \
        gtkplug.h               \
        gtkpreview.h            \
@@ -298,6 +298,7 @@ gtk_public_h_sources =              \
        gtkscrolledwindow.h     \
        gtkselection.h          \
        gtkseparator.h          \
+       gtksizegroup.h  \
        gtksignal.h             \
        gtksocket.h             \
        gtkspinbutton.h         \
@@ -323,7 +324,6 @@ gtk_public_h_sources =              \
        gtktree.h               \
        gtktreeitem.h           \
        gtktreemodel.h          \
-       gtktreemodelsimple.h    \
        gtktreemodelsort.h      \
        gtktreeselection.h      \
        gtktreesortable.h       \
@@ -342,31 +342,18 @@ gtk_public_h_sources =            \
        gtkwidget.h             \
        gtkwindow.h
 
-# More headers to use when autogenerating.
-gdk_headers =                  \
-       ..\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
 
-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:
@@ -374,8 +361,8 @@ GENERATED = gtk.defs gtktypebuiltins.h gtktypebuiltins_vars.c gtktypebuiltins_id
 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
 
@@ -395,85 +382,43 @@ gtktypebuiltins_ids.c: gtk.defs maketypes.awk
 gtktypebuiltins_evals.c: makeenums.pl gtk.defs
        $(PERL) makeenums.pl arrays $(gtk_public_h_sources) $(gdk_headers) >gtktypebuiltins_evals.c
 
+# private marshalers
+gtkmarshalers.h : gtkmarshalers.list
+       $(GLIB)\gobject\glib-genmarshal --prefix=_gtk_marshal gtkmarshalers.list --header >>gtkmarshalers.h
+
+gtkmarshalers.c : gtkmarshalers.list
+       $(GLIB)\gobject\glib-genmarshal --prefix=_gtk_marshal gtkmarshalers.list --body >gtkmarshalers.c
+
+# public, deprecated marshalers
 gtkmarshal.h : gtkmarshal.list
-       glib-genmarshal --prefix=gtk_marshal gtkmarshal.list --header >gtkmarshal.h
+       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
 
 gtkmarshal.c : gtkmarshal.list
-       glib-genmarshal --prefix=gtk_marshal gtkmarshal.list --body >gtkmarshal.c
+       $(GLIB)\gobject\glib-genmarshal --prefix=gtk_marshal gtkmarshal.list --body >gtkmarshal.c
+
+gtksignal.obj : gtksignal.c gtkmarshal.c gtkmarshal.h
+       $(CC) $(CFLAGS) -GD -c -DGTK_COMPILATION -DG_LOG_DOMAIN=\"Gtk\" gtksignal.c
 
 #
 # 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
-
-testdnd.exe : gtk-win32-$(GTK_VER).dll testdnd.obj
-       $(CC) $(CFLAGS) testdnd.obj $(GTK_LIBS) $(GDK_LIBS) $(GLIB_LIBS) $(LDFLAGS)
-
-testdnd.obj : testdnd.c
-       $(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testdnd\" testdnd.c
-
-testgtk.exe : gtk-win32-$(GTK_VER).dll testgtk.obj
-       $(CC) $(CFLAGS) testgtk.obj $(GTK_LIBS) $(GDK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(LDFLAGS)
+       $(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
 
-testgtk.obj : testgtk.c
-       $(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testgtk\" testgtk.c
+gtk-win32-$(GTK_VER)s.lib : $(gtk_OBJECTS)
+       lib /out:gtk-win32-$(GTK_VER)s.lib $(gtk_OBJECTS)
 
-testinput.exe : gtk-win32-$(GTK_VER).dll testinput.obj
-       $(CC) $(CFLAGS) testinput.obj $(GTK_LIBS) $(GDK_LIBS) $(GLIB_LIBS) $(LDFLAGS)
+gtk-query-immodules-$(GTK_VER).exe : queryimmodules.obj
+       $(CC) $(CFLAGS) -Fe$@ queryimmodules.obj $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(LDFLAGS)
 
-testinput.obj : testinput.c
-       $(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testinput\" testinput.c
+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
 
-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
-
-testtextbuffer.exe : gtk-win32-$(GTK_VER).dll testtextbuffer.obj
-       $(CC) $(CFLAGS) testtextbuffer.obj $(GDK_PIXBUF_LIBS) $(GTK_LIBS) $(GDK_LIBS) $(GLIB_LIBS) $(LDFLAGS)
-
-testtextbuffer.obj : testtextbuffer.c
-       $(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testtextbuffer\" testtextbuffer.c
-
-testthreads.exe : gtk-win32-$(GTK_VER).dll testthreads.obj
-       $(CC) $(CFLAGS) testthreads.obj $(GTK_LIBS) $(GDK_LIBS) $(GLIB_LIBS) $(PTHREAD_LIBS) $(LDFLAGS)
-
-testthreads.obj : testthreads.c
-       $(CC) $(CFLAGS) $(PTHREAD_CFLAGS) -c -DG_LOG_DOMAIN=\"testthreads\" -DUSE_PTHREADS=1 testthreads.c
-
-simple.exe : gtk-win32-$(GTK_VER).dll simple.obj
-       $(CC) $(CFLAGS) simple.obj $(GTK_LIBS) $(GDK_LIBS) $(GLIB_LIBS) $(LDFLAGS)
-
-simple.obj : simple.c
-       $(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"simple\" simple.c
+# General rule for compiling the objects into the DLL
+.c.obj :
+       $(CC) $(CFLAGS) -GD -c -DGTK_COMPILATION -DG_LOG_DOMAIN=\"Gtk\" $<
 
 $(EXAMPLE).obj : ..\examples\$(EXAMPLE)\$(EXAMPLE).c
        $(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"$(EXAMPLE)\" ..\examples\$(EXAMPLE)\$(EXAMPLE).c