Update.

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

diff --git a/tests/makefile.msc b/tests/makefile.msc
index 76bc25e3ecd50c4e241c55fbd217d142ab1e6105..f849a82c43fbd3dbdb2cf2828c7b07fa02ca0d96 100644 (file)
--- a/tests/makefile.msc
+++ b/tests/makefile.msc
@@ -5,21 +5,20 @@
 ## how to install for yourself.
 
 TOP = ..\..
-!INCLUDE $(TOP)/build/win32/make.msc
+!INCLUDE $(TOP)/glib/build/win32/make.msc
 
 ################################################################
 
 # Possibly override versions from build/win32/module.defs
-GTK_VER = 1.3
-GDK_PIXBUF_VER = 1.3
-GTK_VER=1.3
+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 = -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=\"GtkTest\" -DGTK_VERSION=\"$(GTK_VER)\"
 
@@ -30,6 +29,7 @@ TOUCH = copy makefile.msc+nul
 all :  \
        ..\config.h     \
        prop-editor.obj \
+       testsocket_common.obj \
        all-test-apps
 
 ..\config.h : ..\config.h.win32
@@ -39,21 +39,68 @@ all :       \
 #
 # Test programs:
 #
-TESTAPPS = testcalendar testdnd testgtk testinput testrgb testselection \
-               testtext testtextbuffer testsocket testsocket_child \
-               testtreecolumns testtreefocus testtreesort testtreeview treestoretest \
-               testthreads simple
+TESTAPPS = \
+       autotestfilechooser floatingtest \
+       testaccel testactions \
+       testcairo testcalendar testcellrenderertext testcombo testcombochange \
+       testdnd \
+       testellipsise testentrycompletion \
+       testfilechooser testfilechooserbutton \
+       testgtk \
+       testicontheme testiconview testimage testinput \
+       testmenus testmenubars testmerge testmultidisplay testmultiscreen \
+       testnotebookdnd \
+       testrecentchooser testrgb \
+       testselection testspinbutton \
+       testtext testtextbuffer testtoolbar \
+       testtreecolumns testtreeedit testtreeflow testtreefocus \
+       testtreesort testtreeview treestoretest \
+       testsocket testsocket_child teststatusicon \
+       testthreads testxinerama \
+       simple 
+
+# syntax error : illegal character '-' in macro
+#stresstest-toolbar
 
 
 all-test-apps: 
-       for %d in ($(TESTAPPS)) do nmake -nologo -f makefile.msc one-test-app THIS=%d
+       @for %d in ($(TESTAPPS)) do @nmake -nologo -f makefile.msc one-test-app THIS=%d
 
 one-test-app:
        @nmake -nologo -f makefile.msc $(THIS).exe TESTAPP=$(THIS) EXTRA_$(THIS)=1
 
 !ELSE
 
+!IFDEF EXTRA_testcairo
+EXTRA_LIBS = $(CAIRO_LIBS)
+!ENDIF
+
+!IFDEF EXTRA_testentrycompletion
+EXTRA_OBJETCS = prop-editor.obj
+!ENDIF
+
+!IFDEF EXTRA_testfilechooserbutton
+EXTRA_OBJETCS = prop-editor.obj
+!ENDIF
+
 !IFDEF EXTRA_testgtk
+EXTRA_LIBS = $(CAIRO_LIBS)
+EXTRA_OBJETCS = prop-editor.obj
+!ENDIF
+
+!IFDEF EXTRA_testiconview
+EXTRA_OBJETCS = prop-editor.obj
+!ENDIF
+
+!IFDEF EXTRA_testsocket
+EXTRA_OBJETCS = testsocket_common.obj
+!ENDIF
+
+!IFDEF EXTRA_testsocket_child
+EXTRA_OBJETCS = testsocket_common.obj
+!ENDIF
+
+!IFDEF EXTRA_testrecentchooser
 EXTRA_OBJETCS = prop-editor.obj
 !ENDIF
 
@@ -65,8 +112,17 @@ EXTRA_OBJETCS = prop-editor.obj
 EXTRA_OBJETCS = prop-editor.obj
 !ENDIF
 
-$(TESTAPP).exe : ../gtk/gtk-win32-$(GTK_VER).dll $(TESTAPP).obj
-       $(CC) $(CFLAGS) $(TESTAPP).obj $(EXTRA_OBJETCS) $(GTK_LIBS) $(GDK_LIBS) $(GDK_PIXBUF_LIBS) $(PANGO_LIBS) $(GLIB_LIBS) $(LDFLAGS)
+!IFDEF EXTRA_testtoolbar
+EXTRA_OBJETCS = prop-editor.obj
+!ENDIF
+
+!IFDEF EXTRA_testfilechooser
+EXTRA_OBJETCS = prop-editor.obj
+EXTRA_LIBS = gdi32.lib user32.lib shell32.lib
+!ENDIF
+
+$(TESTAPP).exe : ../gtk/gtk-win32-$(GTK_VER).lib $(TESTAPP).obj
+       $(CC) $(CFLAGS) $(TESTAPP).obj $(EXTRA_OBJETCS) $(GTK_LIBS) $(GDK_LIBS) $(GDK_PIXBUF_LIBS) $(PANGO_LIBS) $(GLIB_LIBS) $(EXTRA_LIBS) $(LDFLAGS)
 
 $(TESTAPP).obj : $(TESTAPP).c
        $(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"$(TESTAPP)\" $(TESTAPP).c