[cairo-commit] boilerplate/Makefile.win32 test/Makefile.win32 test/pdiff

[Jeff Muizelaar]

 boilerplate/Makefile.win32 |    2 +-
 test/Makefile.win32        |    9 ++++++---
 test/pdiff/Makefile.win32  |    2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 2d6336624c33e9c674c192b68eb501373a96dc87
Author: Jeff Muizelaar <jmuizelaar at mozilla.com>
Date:   Wed Apr 1 11:32:58 2009 -0400

    [test-win32] Fix static linking of the test suite.
    
    Previously, the test suite needed to be dynamically linked to work.

diff --git a/boilerplate/Makefile.win32 b/boilerplate/Makefile.win32
index 84075da..286ea2b 100644
--- a/boilerplate/Makefile.win32
+++ b/boilerplate/Makefile.win32
@@ -13,7 +13,7 @@ SOURCES = \
 	$(enabled_cairo_boilerplate_sources) \
 	$(NULL)
 
-OBJECTS = $(patsubst %.c, $(CFG)/%.obj, $(SOURCES))
+OBJECTS = $(patsubst %.c, $(CFG)/%-static.obj, $(SOURCES))
 
 
 all: $(CFG)/boiler.lib
diff --git a/test/Makefile.win32 b/test/Makefile.win32
index f4c1291..f6a936e 100644
--- a/test/Makefile.win32
+++ b/test/Makefile.win32
@@ -19,14 +19,17 @@ cairo-test-constructors.c: $(test_sources)
 
 SOURCES = $(cairo_test_suite_sources) $(test_sources) cairo-test-constructors.c
 
-OBJECTS = $(patsubst %.c, $(CFG)/%.obj, $(SOURCES))
+OBJECTS = $(patsubst %.c, $(CFG)/%-static.obj, $(SOURCES))
 
-cairo-test-suite.exe: $(OBJECTS)
-	$(CC) $(OPT) $(MS_MDFLAGS) $(OBJECTS) -Fe"$@" -link $(LDFLAGS) /NODEFAULTLIB:library
+cairo-test-suite.exe: $(OBJECTS) ./pdiff/pdiff.lib ../boilerplate/$(CFG)/boiler.lib
+	$(CC) $(OPT) $(MS_MDFLAGS) $(OBJECTS) -Fe"$@" -link $(LDFLAGS) $(CAIRO_LIBS) /NODEFAULTLIB:library
 
 ./pdiff/pdiff.lib:
 	(cd pdiff ; $(MAKE) -f Makefile.win32)
 
+../boilerplate/$(CFG)/boiler.lib:
+	(cd ../boilerplate ; $(MAKE) -f Makefile.win32)
+
 .PHONY: check test html
 
 check: cairo-test-suite.exe
diff --git a/test/pdiff/Makefile.win32 b/test/pdiff/Makefile.win32
index 5e6680d..851d3af 100644
--- a/test/pdiff/Makefile.win32
+++ b/test/pdiff/Makefile.win32
@@ -16,4 +16,4 @@ pdiff.lib: $(OBJECTS)
 	lib -NOLOGO -OUT:$@ $(OBJECTS)
 
 %.obj: %.c
-	@$(CC) $(CFLAGS) -c -Fo"$@" $<
+	@$(CC) $(CFLAGS) -DCAIRO_WIN32_STATIC_BUILD=1 -c -Fo"$@" $<