diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-12-16 15:31:34 +0100 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-12-16 15:32:09 +0100 |
| commit | 6de6fcefdef8d03318bf431a2f650bbe80b9753e (patch) | |
| tree | 84e13445e6186a459ac30473ba6d516b018a935e /cairo | |
| parent | b55c8f783d9668c1beeadf631c6a50f3f8dbd815 (diff) | |
Missing pixman file
Diffstat (limited to 'cairo')
| -rw-r--r-- | cairo/pixman-0.24.0.patch | 58 | ||||
| -rw-r--r-- | cairo/pixman/makefile.mk | 2 |
2 files changed, 60 insertions, 0 deletions
diff --git a/cairo/pixman-0.24.0.patch b/cairo/pixman-0.24.0.patch index 36cf368bb426..0611962a96d5 100644 --- a/cairo/pixman-0.24.0.patch +++ b/cairo/pixman-0.24.0.patch @@ -1,3 +1,61 @@ +--- misc/pixman-0.24.0/Makefile.win32.common 2011-12-16 15:30:44.653987145 +0100 ++++ misc/build/pixman-0.24.0/Makefile.win32.common 2011-12-16 15:30:37.288130250 +0100 +@@ -1 +1,54 @@ +-dummy ++LIBRARY = pixman-1 ++ ++CC = cl ++LD = link ++AR = lib ++PERL = perl ++ ++ifeq ($(top_builddir),) ++top_builddir = $(top_srcdir) ++endif ++ ++CFG_VAR = $(CFG) ++ifeq ($(CFG_VAR),) ++CFG_VAR = release ++endif ++ ++ifeq ($(CFG_VAR),debug) ++CFG_CFLAGS = -MDd -Od -Zi ++CFG_LDFLAGS = -DEBUG ++else ++CFG_CFLAGS = -MD -O2 ++CFG_LDFLAGS = ++endif ++ ++# Package definitions, to be used instead of those provided in config.h ++PKG_CFLAGS = -DPACKAGE=$(LIBRARY) -DPACKAGE_VERSION="" -DPACKAGE_BUGREPORT="" ++ ++BASE_CFLAGS = -nologo -I. -I$(top_srcdir) -I$(top_srcdir)/pixman ++ ++PIXMAN_CFLAGS = $(BASE_CFLAGS) $(PKG_CFLAGS) $(CFG_CFLAGS) $(CFLAGS) ++PIXMAN_LDFLAGS = -nologo $(CFG_LDFLAGS) $(LDFLAGS) ++PIXMAN_ARFLAGS = -nologo $(LDFLAGS) ++ ++ ++inform: ++ifneq ($(CFG),release) ++ifneq ($(CFG),debug) ++ifneq ($(CFG),) ++ @echo "Invalid specified configuration option: "$(CFG)"." ++ @echo ++ @echo "Possible choices for configuration are 'release' and 'debug'" ++ @exit 1 ++endif ++ @echo "Using default RELEASE configuration... (use CFG=release or CFG=debug)" ++endif ++endif ++ ++ ++$(CFG_VAR)/%.obj: %.c $(BUILT_SOURCES) ++ @mkdir -p $(CFG_VAR) ++ @$(CC) -c $(PIXMAN_CFLAGS) -Fo"$@" $< ++ ++clean: inform ++ @$(RM) $(CFG_VAR)/*.{exe,ilk,lib,obj,pdb} $(BUILT_SOURCES) || exit 0 --- misc/pixman-0.24.0/Makefile.in 2011-11-06 22:11:25.000000000 +0100 +++ misc/build/pixman-0.24.0/Makefile.in 2011-12-16 09:06:45.317211035 +0100 @@ -272,7 +272,7 @@ diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk index b0595e8a36f1..fd9d960c2cb7 100644 --- a/cairo/pixman/makefile.mk +++ b/cairo/pixman/makefile.mk @@ -48,6 +48,8 @@ PIXMANVERSION=0.24.0 TARFILE_NAME=pixman-$(PIXMANVERSION) TARFILE_MD5=db5ffcd50064421176e8afb7b85fd1a7 +ADDITIONAL_FILES=Makefile.win32.common + PATCH_FILES=..$/$(TARFILE_NAME).patch # Note: we are building static pixman library to avoid linking problems. |