diff options
| -rw-r--r-- | test/Makefile.win32 | 6 | ||||
| -rw-r--r-- | test/pdiff/Makefile.win32 | 9 |
2 files changed, 6 insertions, 9 deletions
diff --git a/test/Makefile.win32 b/test/Makefile.win32 index 091e58896..ff5e2661d 100644 --- a/test/Makefile.win32 +++ b/test/Makefile.win32 @@ -4,7 +4,7 @@ include $(top_srcdir)/test/Makefile.sources CFLAGS += -I../src -I../boilerplate -I./pdiff -TEST_LIBS = ./pdiff/pdiff.lib $(top_srcdir)/src/$(CFG)/cairo-static.lib $(top_srcdir)/boilerplate/$(CFG)/boiler.lib +TEST_LIBS = ./pdiff/$(CFG)/pdiff.lib $(top_srcdir)/src/$(CFG)/cairo-static.lib $(top_srcdir)/boilerplate/$(CFG)/boiler.lib all: inform cairo-test-suite.exe @@ -18,8 +18,8 @@ OBJECTS = $(patsubst %.c, $(CFG)/%-static.obj, $(SOURCES)) cairo-test-suite.exe: $(OBJECTS) $(TEST_LIBS) $(CC) $(OPT) $(MS_MDFLAGS) $(OBJECTS) -Fe"$@" -link $(LDFLAGS) $(TEST_LIBS) $(CAIRO_LIBS) -./pdiff/pdiff.lib: - (cd pdiff ; $(MAKE) -f Makefile.win32) +./pdiff/$(CFG)/pdiff.lib: + $(MAKE) -C pdiff -f Makefile.win32 $(top_srcdir)/src/$(CFG)/cairo-static.lib: $(MAKE) -C $(top_srcdir)/src -f Makefile.win32 diff --git a/test/pdiff/Makefile.win32 b/test/pdiff/Makefile.win32 index 851d3af65..f25383e8b 100644 --- a/test/pdiff/Makefile.win32 +++ b/test/pdiff/Makefile.win32 @@ -8,12 +8,9 @@ SOURCES = \ pdiff.c \ $(NULL) -OBJECTS = $(subst .c,.obj,$(SOURCES)) +OBJECTS = $(patsubst %.c, $(CFG)/%-static.obj, $(SOURCES)) -all: pdiff.lib +all: $(CFG)/pdiff.lib -pdiff.lib: $(OBJECTS) +$(CFG)/pdiff.lib: $(OBJECTS) lib -NOLOGO -OUT:$@ $(OBJECTS) - -%.obj: %.c - @$(CC) $(CFLAGS) -DCAIRO_WIN32_STATIC_BUILD=1 -c -Fo"$@" $< |