make it compile with msvc: !HAVE_UNISTD_H; no label without op, even if

[~andy/gtk] / gtk / makefile.msc.in

diff --git a/gtk/makefile.msc.in b/gtk/makefile.msc.in
index 8105b9dc9353c2ca06d744c88342b282409fa79c..965dd6e9e8bfa42be0c0374098df598c2ed0aab4 100644 (file)
--- a/gtk/makefile.msc.in
+++ b/gtk/makefile.msc.in
@@ -5,7 +5,7 @@
 ## how to install for yourself.
 
 TOP = ..\..
-!INCLUDE $(TOP)/build/win32/make.msc
+!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,30 +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) $(ATK_CFLAGS)
+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 = -DG_ENABLE_DEBUG -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                \
+       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                              \
@@ -55,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                      \
@@ -70,7 +81,6 @@ gtk_OBJECTS =                                         \
        gtkcontainer.obj                        \
        gtkctree.obj                            \
        gtkcurve.obj                            \
-       gtkdata.obj                             \
        gtkdialog.obj                           \
        gtkdnd.obj                              \
        gtkdrawingarea.obj                      \
@@ -109,6 +119,8 @@ gtk_OBJECTS =                                       \
        gtklistitem.obj                         \
        gtkliststore.obj                                \
        gtkmain.obj                             \
+       gtkmarshalers.obj               \
+       gtkmarshal.obj          \
        gtkmenu.obj                             \
        gtkmenubar.obj                          \
        gtkmenuitem.obj                         \
@@ -119,7 +131,6 @@ gtk_OBJECTS =                                       \
        gtkobject.obj                           \
        gtkoldeditable.obj                      \
        gtkoptionmenu.obj                       \
-       gtkpacker.obj                           \
        gtkpaned.obj                            \
        gtkpixmap.obj                           \
        gtkplug.obj                             \
@@ -140,6 +151,7 @@ gtk_OBJECTS =                                       \
        gtkseparatormenuitem.obj \
        gtksettings.obj \
        gtksignal.obj                           \
+       gtksizegroup.obj \
        gtksocket.obj                           \
        gtkspinbutton.obj                       \
        gtkstyle.obj                            \
@@ -170,7 +182,6 @@ gtk_OBJECTS =                                       \
        gtktreednd.obj                          \
        gtktreeitem.obj                         \
        gtktreemodel.obj                        \
-#      gtktreemodelsimple.obj                  \
        gtktreemodelsort.obj                    \
        gtktreeselection.obj                    \
        gtktreesortable.obj \
@@ -195,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                \
@@ -213,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                \
@@ -261,6 +270,7 @@ gtk_public_h_sources =              \
        gtklistitem.h           \
        gtkliststore.h          \
        gtkmain.h               \
+       gtkmarshal.h    \
        gtkmenu.h               \
        gtkmenubar.h            \
        gtkmenuitem.h           \
@@ -271,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            \
@@ -290,6 +298,7 @@ gtk_public_h_sources =              \
        gtkscrolledwindow.h     \
        gtkselection.h          \
        gtkseparator.h          \
+       gtksizegroup.h  \
        gtksignal.h             \
        gtksocket.h             \
        gtkspinbutton.h         \
@@ -315,7 +324,6 @@ gtk_public_h_sources =              \
        gtktree.h               \
        gtktreeitem.h           \
        gtktreemodel.h          \
-       gtktreemodelsimple.h    \
        gtktreemodelsort.h      \
        gtktreeselection.h      \
        gtktreesortable.h       \
@@ -334,10 +342,18 @@ gtk_public_h_sources =            \
        gtkwidget.h             \
        gtkwindow.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:
@@ -345,7 +361,7 @@ 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)
+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
@@ -366,8 +382,18 @@ 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)\gobject\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)\gobject\glib-genmarshal --prefix=gtk_marshal gtkmarshal.list --body >gtkmarshal.c
@@ -379,7 +405,16 @@ gtksignal.obj : gtksignal.c gtkmarshal.c 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
+       $(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
+
+gtk-win32-$(GTK_VER)s.lib : $(gtk_OBJECTS)
+       lib /out:gtk-win32-$(GTK_VER)s.lib $(gtk_OBJECTS)
+
+gtk-query-immodules-$(GTK_VER).exe : queryimmodules.obj
+       $(CC) $(CFLAGS) -Fe$@ queryimmodules.obj $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_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
 
 # General rule for compiling the objects into the DLL
 .c.obj :