diff options
| author | Hans Breuer <hans@breuer.org> | 2011-01-02 12:00:44 +0100 |
|---|---|---|
| committer | Hans Breuer <hans@breuer.org> | 2011-01-02 13:33:06 +0100 |
| commit | 95213b3f045a080b92d8e830625023a8ac6370c3 (patch) | |
| tree | d5514fe0e1f7d9acc0cd9534b827a71a506e820b /tests | |
| parent | 1d838f586c574af7f05c618a337f8d34a58d9125 (diff) | |
| download | gtk+-95213b3f045a080b92d8e830625023a8ac6370c3.tar.gz | |
win32: update msvc build
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/makefile.msc | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/tests/makefile.msc b/tests/makefile.msc index 9b097a70f6..8d0532e401 100644 --- a/tests/makefile.msc +++ b/tests/makefile.msc @@ -10,14 +10,12 @@ TOP = ..\.. ################################################################ # Possibly override versions from build/win32/module.defs -GTK_VER = 2.0 -GDK_PIXBUF_VER = 2.0 +GTK_VER = 3.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 = -I . -I .. -I ../gdk -I ../gdk-pixbuf -I ../gtk +INCLUDES = -I . -I .. -I ../gdk -I ../gtk $(GDK_PIXBUF_CFLAGS) DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) $(INTL_CFLAGS) $(ATK_CFLAGS) $(CAIRO_CFLAGS) LDFLAGS = /link /machine:ix86 $(LINKDEBUG) DEFINES = -DG_LOG_DOMAIN=\"GtkTest\" -DGTK_VERSION=\"$(GTK_VER)\" @@ -43,7 +41,7 @@ TESTAPPS = \ # autotestfilechooser autotestfilesystem \ # buildertest floatingtest \ flicker \ - objecttests \ +# objecttests \ testaccel testactions testassistant \ testbbox testbuttons \ testcairo testcalendar testcellrenderertext testclientmessage testcombo testcombochange \ @@ -52,13 +50,13 @@ TESTAPPS = \ testfilechooser testfilechooserbutton testframe \ testgrouping testgtk \ testicontheme testiconview testimage testinput \ - testmenus testmountoperation testmenubars testmerge testmultidisplay testmultiscreen \ + testmountoperation testmenubars testmerge testmultidisplay testmultiscreen \ testnouiprint testnotebookdnd \ testoffscreen testorientable \ testprint \ - testrecentchooser testrecentchoosermenu testrgb testrichtext \ + testrecentchooser testrecentchoosermenu testrichtext \ testscale testselection testspinbutton \ - testtext testtoolbar testtooltips \ + testtoolbar testtooltips \ testtreecolumns testtreecolumnsizing testtreeedit testtreeflow testtreefocus \ testtreemodel testtreesort testtreeview treestoretest \ testsocket testsocket_child teststatusicon \ @@ -110,7 +108,7 @@ EXTRA_OBJETCS = testsocket_common.obj $(TESTAPP).exe : ../gtk/gtk-win32-$(GTK_VER).lib $(TESTAPP).obj $(EXTRA_OBJETCS) $(CC) $(CFLAGS) $(TESTAPP).obj $(EXTRA_OBJETCS) $(GTK_LIBS) $(GDK_LIBS) $(GDK_PIXBUF_LIBS) \ - $(PANGO_LIBS) $(GLIB_LIBS) $(CAIRO_LIBS) $(EXTRA_LIBS) $(LDFLAGS) + $(PANGO_LIBS) $(PANGOCAIRO_LIBS) $(GLIB_LIBS) $(CAIRO_LIBS) $(EXTRA_LIBS) $(LDFLAGS) $(TESTAPP).obj : $(TESTAPP).c $(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"$(TESTAPP)\" $(TESTAPP).c |