diff options
| author | Vladimir Vukicevic <vladimir@pobox.com> | 2008-08-05 12:57:51 -0700 |
|---|---|---|
| committer | Vladimir Vukicevic <vladimir@sleet.vlad1.com> | 2008-08-05 12:57:51 -0700 |
| commit | 924a242f89ab1d86750512c8e4ee367c270ee07a (patch) | |
| tree | 720fd7ffbdbd2d01cd9e91369fd2033a04a0bd7a /Makefile.win32 | |
| parent | e1132d434e329c625667f6aff30634522108241e (diff) | |
[win32] Update win32 build, remove gcc dependency
Diffstat (limited to 'Makefile.win32')
| -rw-r--r-- | Makefile.win32 | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/Makefile.win32 b/Makefile.win32 index 4349cd88..d19c2aa5 100644 --- a/Makefile.win32 +++ b/Makefile.win32 @@ -26,7 +26,7 @@ DEFAULT_CFLAGS += -DCAIRO_NO_MUTEX=1 -DLIBCAIRO_EXPORTS CFLAGS := $(DEFAULT_CFLAGS) CAIRO_VERSION_MAJOR = 1 -CAIRO_VERSION_MINOR = 5 +CAIRO_VERSION_MINOR = 7 CAIRO_VERSION_MICRO = 1 CAIRO_VERSION = $(CAIRO_VERSION_MAJOR).$(CAIRO_VERSION_MINOR).$(CAIRO_VERSION_MICRO) @@ -40,16 +40,23 @@ TEST_SUBDIRS = boilerplate test all: inform cairo +src/cairo-features.h: + @echo Warning: creating default cairo-features.h + @(cat src/cairo-features-win32.h | \ + sed 's,@CAIRO_VERSION_MAJOR@,'$(CAIRO_VERSION_MAJOR)',g' | \ + sed 's,@CAIRO_VERSION_MINOR@,'$(CAIRO_VERSION_MINOR)',g' | \ + sed 's,@CAIRO_VERSION_MICRO@,'$(CAIRO_VERSION_MICRO)',g' > src/cairo-features.h) + cairo: src/cairo-features.h @list='$(SUBDIRS)'; for f in $$list ; do \ echo making all in $$f... ; \ - (cd $$f ; $(MAKE) -f Makefile.win32 CC="$(CC)" LINK="$(LINK)" OPT="$(OPT)" CFLAGS="$(CFLAGS)" PIXMAN_LIBS="$(PIXMAN_LIBS)") || exit 1 ; \ + ($(MAKE) -C $$f -f Makefile.win32) || exit 1 ; \ done test: cairo @list='$(TEST_SUBDIRS)'; for f in $$list ; do \ echo making all in $$f... ; \ - (cd $$f ; $(MAKE) -f Makefile.win32 CC="$(CC)" LINK="$(LINK)" OPT="$(OPT)" CFLAGS="$(CFLAGS)" PIXMAN_LIBS="$(PIXMAN_LIBS)") || exit 1 ; \ + ($(MAKE) -C $$f -f Makefile.win32) || exit 1 ; \ done @(cd test ; make -f Makefile.win32 test) |