diff options
| author | Jeff Muizelaar <jmuizelaar@mozilla.com> | 2009-04-01 11:32:58 -0400 |
|---|---|---|
| committer | Jeff Muizelaar <jmuizelaar@mozilla.com> | 2009-04-01 11:32:58 -0400 |
| commit | 2d6336624c33e9c674c192b68eb501373a96dc87 (patch) | |
| tree | be3b296e2ac0cda6ec5939c944f927ac3cde68fd /test/Makefile.win32 | |
| parent | 0f21893b0510a188439c2d8cd448bcfcf17ef8c6 (diff) | |
[test-win32] Fix static linking of the test suite.
Previously, the test suite needed to be dynamically linked to work.
Diffstat (limited to 'test/Makefile.win32')
| -rw-r--r-- | test/Makefile.win32 | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/test/Makefile.win32 b/test/Makefile.win32 index f4c129161..f6a936edb 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 |