diff options
author | Hans Breuer <hans@breuer.org> | 2009-11-08 18:26:03 +0100 |
---|---|---|
committer | Hans Breuer <hans@breuer.org> | 2010-11-07 23:35:04 +0100 |
commit | dc40e17af8e2eed5b47e1c7494cb3d98397ce35a (patch) | |
tree | d6590e4d963d05246b4ca06185a7846a56a23d61 /demos | |
parent | 9dfeee81276832960dd63571a554d92c34cde0f0 (diff) | |
download | gtk+-dc40e17af8e2eed5b47e1c7494cb3d98397ce35a.tar.gz |
Update msvc build
Diffstat (limited to 'demos')
-rw-r--r-- | demos/gtk-demo/makefile.msc.in | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/demos/gtk-demo/makefile.msc.in b/demos/gtk-demo/makefile.msc.in index f4d857c610..a92362f3af 100644 --- a/demos/gtk-demo/makefile.msc.in +++ b/demos/gtk-demo/makefile.msc.in @@ -14,15 +14,15 @@ PERL = perl ################################################################ # Possibly override versions from build/win32/module.defs -GTK_VER = @GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@ -GDK_PIXBUF_VER = @GDK_PIXBUF_MAJOR@.@GDK_PIXBUF_MINOR@ +GTK_VER = 2.0 +GDK_PIXBUF_VER = 2.0 GDK_LIBS = ../../gdk/gdk-win32-$(GTK_VER).lib GTK_LIBS = ../../gtk/gtk-win32-$(GTK_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 -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) DEFINES = -DG_LOG_DOMAIN=\"GtkDemo\" -DGTK_VERSION=\"$(GTK_VER)\" \ -DDEMOCODEDIR=\".\" @@ -90,5 +90,6 @@ OBJECTS = \ main.obj \ 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) |