1 files changed, 22 insertions, 67 deletions
diff --git a/pixman/test/Makefile.win32 b/pixman/test/Makefile.win32
index a62b6fc35..307ba0c23 100644
--- a/pixman/test/Makefile.win32
+++ b/pixman/test/Makefile.win32
@@ -1,76 +1,31 @@
-CC   = cl
-LINK = link
+default: all
 
-CFG_VAR = $(CFG)
-ifeq ($(CFG_VAR),)
-CFG_VAR=release
-endif
+top_srcdir = ..
+include $(top_srcdir)/test/Makefile.sources
+include $(top_srcdir)/Makefile.win32.common
 
-CFLAGS     = -MD -nologo -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_BIND_TO_CURRENT_VCLIBS_VERSION -D_MT -I../pixman -I. -I../
-TEST_LDADD = ../pixman/$(CFG_VAR)/pixman-1.lib
-INCLUDES = -I../pixman -I$(top_builddir)/pixman
+TEST_LDADD = \
+	$(top_builddir)/pixman/$(CFG_VAR)/$(LIBRARY).lib \
+	$(CFG_VAR)/libutils.lib \
+	$(NULL)
 
-# optimization flags
-ifeq ($(CFG_VAR),debug)
-CFLAGS += -Od -Zi
-else
-CFLAGS += -O2
-endif
+libutils_OBJECTS = $(patsubst %.c, $(CFG_VAR)/%.obj, $(libutils_sources))
 
-SOURCES =			\
-	a1-trap-test.c		\
-	pdf-op-test.c		\
-	region-test.c		\
-	region-translate-test.c	\
-	fetch-test.c		\
-	oob-test.c		\
-	trap-crasher.c		\
-	alpha-loop.c		\
-	scaling-crash-test.c	\
-	gradient-crash-test.c	\
-	alphamap.c		\
-	stress-test.c		\
-	composite-traps-test.c	\
-	blitters-test.c		\
-	scaling-test.c		\
-	affine-test.c		\
-	composite.c		\
-	lowlevel-blt-bench.c	\
-	utils.c
+SOURCES = $(patsubst %,   %.c,              $(TESTPROGRAMS) $(BENCHMARKS))
+OBJECTS = $(patsubst %.c, $(CFG_VAR)/%.obj, $(SOURCES))
+TESTS   = $(patsubst %,   $(CFG_VAR)/%.exe, $(TESTPROGRAMS))
+BENCHS  = $(patsubst %,   $(CFG_VAR)/%.exe, $(BENCHMARKS))
 
-TESTS =						\
-	$(CFG_VAR)/a1-trap-test.exe		\
-	$(CFG_VAR)/pdf-op-test.exe		\
-	$(CFG_VAR)/region-test.exe		\
-	$(CFG_VAR)/region-translate-test.exe	\
-	$(CFG_VAR)/fetch-test.exe		\
-	$(CFG_VAR)/oob-test.exe			\
-	$(CFG_VAR)/trap-crasher.exe		\
-	$(CFG_VAR)/alpha-loop.exe		\
-	$(CFG_VAR)/scaling-crash-test.exe	\
-	$(CFG_VAR)/gradient-crash-test.exe	\
-	$(CFG_VAR)/alphamap.exe			\
-	$(CFG_VAR)/stress-test.exe		\
-	$(CFG_VAR)/composite-traps-test.exe	\
-	$(CFG_VAR)/blitters-test.exe		\
-	$(CFG_VAR)/scaling-test.exe		\
-	$(CFG_VAR)/affine-test.exe		\
-	$(CFG_VAR)/composite.exe
+all: inform $(TESTS) $(BENCHS)
 
-BENCHMARKS =					\
-	$(CFG_VAR)/lowlevel-blt-bench.exe
+check: inform $(TESTS)
+	@for test in $(TESTS) ; do ./$$test && echo "PASS: $$test" || echo "FAIL: $$test" ; done
 
-OBJECTS     = $(patsubst %.c, $(CFG_VAR)/%.obj, $(SOURCES))
+$(CFG_VAR)/libutils.lib: $(libutils_OBJECTS)
+	@$(AR) $(PIXMAN_ARFLAGS) -OUT:$@ $^
 
-$(CFG_VAR)/%.obj: %.c
-	@mkdir -p $(CFG_VAR)
-	@$(CC) -c $(CFLAGS) -Fo"$@" $<
+$(CFG_VAR)/%.exe: $(CFG_VAR)/%.obj $(TEST_LDADD)
+	@$(LD) $(PIXMAN_LDFLAGS) -OUT:$@ $^
 
-$(CFG_VAR)/%.exe: $(CFG_VAR)/%.obj
-	$(LINK) /NOLOGO /OUT:$@ $< $(CFG_VAR)/utils.obj $(TEST_LDADD)
-
-all: $(OBJECTS) $(TESTS) $(BENCHMARKS)
-	@exit 0
-
-clean:
-	@rm -f $(CFG_VAR)/*.obj $(CFG_VAR)/*.pdb || exit 0
+$(top_builddir)/pixman/$(CFG_VAR)/$(LIBRARY).lib:
+	@$(MAKE) -C $(top_builddir)/pixman -f Makefile.win32