fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-05 01:48:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

[test-win32] Fix static linking of the test suite.

Browse source 
Previously, the test suite needed to be dynamically linked to work.
This commit is contained in:
Jeff Muizelaar 2009-04-01 11:32:58 -04:00
parent 0f21893b05
commit 2d6336624c
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boilerplate/Makefile.win32
View file

@ -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

9
test/Makefile.win32
View file

@ -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

2
test/pdiff/Makefile.win32
View file

@ -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"$@" $<