diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.win32 | 4 | ||||
| -rw-r--r-- | test/pdiff/Makefile.win32 | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/test/Makefile.win32 b/test/Makefile.win32 index ff5e2661d..cd08db867 100644 --- a/test/Makefile.win32 +++ b/test/Makefile.win32 @@ -2,7 +2,7 @@ top_srcdir = .. include $(top_srcdir)/build/Makefile.win32.common include $(top_srcdir)/test/Makefile.sources -CFLAGS += -I../src -I../boilerplate -I./pdiff +CFLAGS += -I$(top_srcdir)/boilerplate -I./pdiff TEST_LIBS = ./pdiff/$(CFG)/pdiff.lib $(top_srcdir)/src/$(CFG)/cairo-static.lib $(top_srcdir)/boilerplate/$(CFG)/boiler.lib @@ -16,7 +16,7 @@ SOURCES = $(cairo_test_suite_sources) $(test_sources) cairo-test-constructors.c 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) + @$(LD) $(CAIRO_LDFLAGS) -OUT:$@ $(OBJECTS) $(TEST_LIBS) $(CAIRO_LIBS) ./pdiff/$(CFG)/pdiff.lib: $(MAKE) -C pdiff -f Makefile.win32 diff --git a/test/pdiff/Makefile.win32 b/test/pdiff/Makefile.win32 index f25383e8b..3d64676da 100644 --- a/test/pdiff/Makefile.win32 +++ b/test/pdiff/Makefile.win32 @@ -1,8 +1,6 @@ top_srcdir = ../.. include $(top_srcdir)/build/Makefile.win32.common -CFLAGS += -I../../src - SOURCES = \ lpyramid.c \ pdiff.c \ @@ -13,4 +11,4 @@ OBJECTS = $(patsubst %.c, $(CFG)/%-static.obj, $(SOURCES)) all: $(CFG)/pdiff.lib $(CFG)/pdiff.lib: $(OBJECTS) - lib -NOLOGO -OUT:$@ $(OBJECTS) + @$(AR) $(CAIRO_ARFLAGS) -OUT:$@ $(OBJECTS) |