From 1c6556f6566b7bdfd2c8f46e8a6b6a35c9ae6891 Mon Sep 17 00:00:00 2001 From: Antoine Azar Date: Thu, 28 Aug 2008 11:06:40 -0700 Subject: [PATCH] Fixed cairo version in win32 makefile --- Makefile.win32 | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile.win32 b/Makefile.win32 index d19c2aa57..a55f12c2f 100644 --- a/Makefile.win32 +++ b/Makefile.win32 @@ -2,6 +2,12 @@ # Win32 makefile # +ifeq ($(SUBMAKEFILE),1) + include ../Version.mk +else + include Version.mk +endif + CC := cl LINK := link @@ -25,9 +31,6 @@ DEFAULT_CFLAGS += -DCAIRO_NO_MUTEX=1 -DLIBCAIRO_EXPORTS CFLAGS := $(DEFAULT_CFLAGS) -CAIRO_VERSION_MAJOR = 1 -CAIRO_VERSION_MINOR = 7 -CAIRO_VERSION_MICRO = 1 CAIRO_VERSION = $(CAIRO_VERSION_MAJOR).$(CAIRO_VERSION_MINOR).$(CAIRO_VERSION_MICRO)