Update expected dump output for color choooser

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

diff --git a/tests/makefile.msc b/tests/makefile.msc
index 2db726f867d163442a105a02e99f9ebc110f2c2b..2e7feb3c830ea10267d4e24e411fddbca55eb55b 100644 (file)
--- 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)\"
@@ -29,7 +27,6 @@ TOUCH = copy makefile.msc+nul
 all :  \
        ..\config.h     \
        prop-editor.obj \
-       testsocket_common.obj \
        all-test-apps
 
 ..\config.h : ..\config.h.win32
@@ -40,26 +37,30 @@ all :       \
 # Test programs:
 #
 TESTAPPS = \
-       autotestfilechooser floatingtest \
+#      autotestfilechooser autotestfilesystem \
+#      buildertest floatingtest \
+       flicker \
+#      objecttests \
        testaccel testactions testassistant \
-       testbbox \
-       testcairo testcalendar testcellrenderertext testcombo testcombochange \
+       testbbox testbuttons \
+       testcairo testcalendar testcellrenderertext testclientmessage testcombo testcombochange \
        testdnd \
-       testellipsise testentrycompletion \
-       testfilechooser testfilechooserbutton \
+       testellipsise testentrycompletion testentryicons \
+       testfilechooser testfilechooserbutton testframe \
        testgrouping testgtk \
        testicontheme testiconview testimage testinput \
-       testmenus testmenubars testmerge testmultidisplay testmultiscreen \
+       testmountoperation testmenubars testmerge testmultidisplay testmultiscreen \
        testnouiprint testnotebookdnd \
+       testoffscreen testorientable \
        testprint \
-       testrecentchooser testrecentchoosermenu testrgb testrichtext \
-       testselection testspinbutton \
-       testtext testtextbuffer testtoolbar testtooltips \
-       testtreecolumns testtreeedit testtreeflow testtreefocus \
+       testrecentchooser testrecentchoosermenu testrichtext \
+       testscale testselection testspinbutton \
+       testtoolbar testtooltips \
+       testtreecolumns testtreecolumnsizing testtreeedit testtreeflow testtreefocus \
        testtreemodel testtreesort testtreeview treestoretest \
-       testsocket testsocket_child teststatusicon \
-       testthreads testvolumebutton testxinerama \
-       simple 
+       teststatusicon \
+       testthreads testvolumebutton testwindows testxinerama \
+       simple
 
 # syntax error : illegal character '-' in macro
 #stresstest-toolbar
@@ -75,6 +76,13 @@ one-test-app:
 
 EXTRA_OBJETCS = prop-editor.obj
 
+!IFDEF EXTRA_buildertest
+EXTRA_LIBS = $(ATK_LIBS)
+!ENDIF
+
+!IFDEF EXTRA_testoffscreen
+EXTRA_OBJETCS = gtkoffscreenbox.obj
+!ENDIF
 
 !IFDEF EXTRA_testprint
 EXTRA_OBJETCS = testprintfileoperation.obj
@@ -99,7 +107,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