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

build: Use common rules for making pdiff

Browse source 
Instead of providing special rules for compiling C files in pdiff, use
the common ones and build a different pdiff for debug and release.
This commit is contained in:
Andrea Canciani 2011-06-18 16:59:00 +02:00
parent f9b50cec2b
commit 5534c30524
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
test/Makefile.win32
View file

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

9
test/pdiff/Makefile.win32
View file

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