Commit dc40e17a authored by Hans Breuer's avatar Hans Breuer

Update msvc build

parent 9dfeee81
...@@ -14,15 +14,15 @@ PERL = perl ...@@ -14,15 +14,15 @@ PERL = perl
################################################################ ################################################################
# Possibly override versions from build/win32/module.defs # Possibly override versions from build/win32/module.defs
GTK_VER = @GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@ GTK_VER = 2.0
GDK_PIXBUF_VER = @GDK_PIXBUF_MAJOR@.@GDK_PIXBUF_MINOR@ GDK_PIXBUF_VER = 2.0
GDK_LIBS = ../../gdk/gdk-win32-$(GTK_VER).lib GDK_LIBS = ../../gdk/gdk-win32-$(GTK_VER).lib
GTK_LIBS = ../../gtk/gtk-win32-$(GTK_VER).lib GTK_LIBS = ../../gtk/gtk-win32-$(GTK_VER).lib
GDK_PIXBUF_LIBS = ../../gdk-pixbuf/gdk_pixbuf-$(GDK_PIXBUF_VER).lib GDK_PIXBUF_LIBS = ../../gdk-pixbuf/gdk_pixbuf-$(GDK_PIXBUF_VER).lib
INCLUDES = -FImsvc_recommended_pragmas.h -I . -I ../.. -I ../../gdk -I ../../gdk-pixbuf -I ../../gtk INCLUDES = -FImsvc_recommended_pragmas.h -I . -I ../.. -I ../../gdk -I ../../gdk-pixbuf -I ../../gtk
DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) $(INTL_CFLAGS) $(ATK_CFLAGS) DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) $(INTL_CFLAGS) $(ATK_CFLAGS) $(CAIRO_CFLAGS)
LDFLAGS = /link /machine:ix86 $(LINKDEBUG) LDFLAGS = /link /machine:ix86 $(LINKDEBUG)
DEFINES = -DG_LOG_DOMAIN=\"GtkDemo\" -DGTK_VERSION=\"$(GTK_VER)\" \ DEFINES = -DG_LOG_DOMAIN=\"GtkDemo\" -DGTK_VERSION=\"$(GTK_VER)\" \
-DDEMOCODEDIR=\".\" -DDEMOCODEDIR=\".\"
...@@ -90,5 +90,6 @@ OBJECTS = \ ...@@ -90,5 +90,6 @@ OBJECTS = \
main.obj \ main.obj \
gtk-demo.exe : demos.h $(OBJECTS) gtk-demo.exe : demos.h $(OBJECTS)
$(CC) $(CFLAGS) -Fegtk-demo.exe $(OBJECTS) $(GTK_LIBS) $(GDK_LIBS) $(GDK_PIXBUF_LIBS) $(PANGO_LIBS) $(GLIB_LIBS) $(LDFLAGS) $(CC) $(CFLAGS) -Fegtk-demo.exe $(OBJECTS) $(GTK_LIBS) $(GDK_LIBS) $(GDK_PIXBUF_LIBS) \
$(CAIRO_LIBS) $(PANGOCAIRO_LIBS) $(PANGO_LIBS) $(GLIB_LIBS) $(LDFLAGS)
...@@ -130,6 +130,7 @@ gtk_OBJECTS_cell = \ ...@@ -130,6 +130,7 @@ gtk_OBJECTS_cell = \
gtkcellrendererpixbuf.obj \ gtkcellrendererpixbuf.obj \
gtkcellrendererprogress.obj \ gtkcellrendererprogress.obj \
gtkcellrendererspin.obj \ gtkcellrendererspin.obj \
gtkcellrendererspinner.obj \
gtkcellview.obj \ gtkcellview.obj \
gtkliststore.obj \ gtkliststore.obj \
gtktreednd.obj \ gtktreednd.obj \
...@@ -287,6 +288,7 @@ gtk_OBJECTS = \ ...@@ -287,6 +288,7 @@ gtk_OBJECTS = \
gtkmountoperation-stub.obj \ gtkmountoperation-stub.obj \
gtknotebook.obj \ gtknotebook.obj \
gtkobject.obj \ gtkobject.obj \
gtkoffscreenwindow.obj \
gtkorientable.obj \ gtkorientable.obj \
gtkpagesetup.obj \ gtkpagesetup.obj \
gtkpaned.obj \ gtkpaned.obj \
...@@ -320,6 +322,7 @@ gtk_OBJECTS = \ ...@@ -320,6 +322,7 @@ gtk_OBJECTS = \
gtksocket.obj \ gtksocket.obj \
gtksocket-win32.obj \ gtksocket-win32.obj \
gtkspinbutton.obj \ gtkspinbutton.obj \
gtkspinner.obj \
gtkstatusicon.obj \ gtkstatusicon.obj \
gtkstyle.obj \ gtkstyle.obj \
gtkstatusbar.obj \ gtkstatusbar.obj \
...@@ -332,6 +335,8 @@ gtk_OBJECTS = \ ...@@ -332,6 +335,8 @@ gtk_OBJECTS = \
gtktoggletoolbutton.obj \ gtktoggletoolbutton.obj \
gtktoolbutton.obj \ gtktoolbutton.obj \
gtktoolitem.obj \ gtktoolitem.obj \
gtktoolitemgroup.obj \
gtktoolpalette.obj \
gtktoolshell.obj \ gtktoolshell.obj \
gtktooltip.obj \ gtktooltip.obj \
gtktreedatalist.obj \ gtktreedatalist.obj \
...@@ -384,6 +389,7 @@ gtk_public_h_sources = \ ...@@ -384,6 +389,7 @@ gtk_public_h_sources = \
gtkcellrendererpixbuf.h \ gtkcellrendererpixbuf.h \
gtkcellrendererprogress.h \ gtkcellrendererprogress.h \
gtkcellrendererspin.h \ gtkcellrendererspin.h \
gtkcellrendererspinner.h \
gtkcellrenderertext.h \ gtkcellrenderertext.h \
gtkcellrenderertoggle.h \ gtkcellrenderertoggle.h \
gtkcellview.h \ gtkcellview.h \
...@@ -462,6 +468,7 @@ gtk_public_h_sources = \ ...@@ -462,6 +468,7 @@ gtk_public_h_sources = \
gtkmountoperation.h \ gtkmountoperation.h \
gtknotebook.h \ gtknotebook.h \
gtkobject.h \ gtkobject.h \
gtkoffscreenwindow.h \
gtkoldeditable.h \ gtkoldeditable.h \
gtkoptionmenu.h \ gtkoptionmenu.h \
gtkpagesetup.h \ gtkpagesetup.h \
...@@ -502,6 +509,7 @@ gtk_public_h_sources = \ ...@@ -502,6 +509,7 @@ gtk_public_h_sources = \
gtksizegroup.h \ gtksizegroup.h \
gtksocket.h \ gtksocket.h \
gtkspinbutton.h \ gtkspinbutton.h \
gtkspinner.h \
gtkstatusbar.h \ gtkstatusbar.h \
gtkstatusicon.h \ gtkstatusicon.h \
gtkstock.h \ gtkstock.h \
...@@ -525,6 +533,8 @@ gtk_public_h_sources = \ ...@@ -525,6 +533,8 @@ gtk_public_h_sources = \
gtktoolbar.h \ gtktoolbar.h \
gtktoolbutton.h \ gtktoolbutton.h \
gtktoolitem.h \ gtktoolitem.h \
gtktoolitemgroup.h \
gtktoolpalette.h \
gtktooltip.h \ gtktooltip.h \
gtktooltips.h \ gtktooltips.h \
gtktree.h \ gtktree.h \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment