diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2008-08-28 17:21:37 -0400 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2008-08-28 17:28:08 -0400 |
| commit | 89900525fb78b20c532b8d983c238896f6e4820c (patch) | |
| tree | ddc77eb531cce26facceea5792b32c4b56541bba /Makefile.win32 | |
| parent | 82303d6170aa541a3dc8c2519c7cc1445fc18842 (diff) | |
Move version number to src/cairo-version.h
Diffstat (limited to 'Makefile.win32')
| -rw-r--r-- | Makefile.win32 | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/Makefile.win32 b/Makefile.win32 index a55f12c2f..a00ff34f9 100644 --- a/Makefile.win32 +++ b/Makefile.win32 @@ -2,12 +2,6 @@ # Win32 makefile # -ifeq ($(SUBMAKEFILE),1) - include ../Version.mk -else - include Version.mk -endif - CC := cl LINK := link @@ -24,7 +18,7 @@ EXE_LDFLAGS = libpng.lib zlib.lib gdi32.lib msimg32.lib user32.lib DEFAULT_CFLAGS = -MD -nologo $(OPT) DEFAULT_CFLAGS += -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DEFAULT_CFLAGS += -DPACKAGE_VERSION="" -DPACKAGE_BUGREPORT="" -DCAIRO_BUILD +DEFAULT_CFLAGS += -DPACKAGE_BUGREPORT="" -DCAIRO_BUILD DEFAULT_CFLAGS += -I. DEFAULT_CFLAGS += $(PIXMAN_CFLAGS) DEFAULT_CFLAGS += -DCAIRO_NO_MUTEX=1 -DLIBCAIRO_EXPORTS @@ -32,8 +26,6 @@ DEFAULT_CFLAGS += -DCAIRO_NO_MUTEX=1 -DLIBCAIRO_EXPORTS CFLAGS := $(DEFAULT_CFLAGS) -CAIRO_VERSION = $(CAIRO_VERSION_MAJOR).$(CAIRO_VERSION_MINOR).$(CAIRO_VERSION_MICRO) - # Only if this was called as the top-level makefile ifeq ($(SUBMAKEFILE),) @@ -45,10 +37,7 @@ 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) + @cp src/cairo-features-win32.h src/cairo-features.h cairo: src/cairo-features.h @list='$(SUBDIRS)'; for f in $$list ; do \ |