From 20c58fa4c54b15188437c34985d03a74c3a0a7d5 Mon Sep 17 00:00:00 2001 From: marha <marha@users.sourceforge.net> Date: Fri, 6 Aug 2010 12:27:58 +0000 Subject: Solved pixman compilation errors. --- makefile.after | 3 +++ pixman/pixman/config.h | 8 +++---- pixman/pixman/makefile | 18 ++++++++------- pixman/pixman/pixman-version.h | 50 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 67 insertions(+), 12 deletions(-) create mode 100644 pixman/pixman/pixman-version.h diff --git a/makefile.after b/makefile.after index 1fe4e08bd..2b119c0ce 100644 --- a/makefile.after +++ b/makefile.after @@ -84,6 +84,9 @@ clean$(OBJDIRPREFIX): $(OBJDIR)\%$(OBJEXT) : %.c $(CC) $(CCFLAGS) $(COMMONCFLAGS) +$(OBJDIR)\%$(OBJEXT) : $(OBJDIR)\%.c + $(CC) $(CCFLAGS) $(COMMONCFLAGS) + $(OBJDIR)\%$(OBJEXT) : %.cc $(CC) $(CCFLAGS) /EHsc $(COMMONCFLAGS) diff --git a/pixman/pixman/config.h b/pixman/pixman/config.h index 65c4c7478..50adacc11 100644 --- a/pixman/pixman/config.h +++ b/pixman/pixman/config.h @@ -95,22 +95,22 @@ #define PACKAGE_NAME "pixman" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "pixman 0.12.0" +#define PACKAGE_STRING "pixman 0.19.1" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "pixman" /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.12.0" +#define PACKAGE_VERSION "0.19.1" /* Major version of this package */ #define PACKAGE_VERSION_MAJOR 0 /* Minor version of this package */ -#define PACKAGE_VERSION_MINOR 12 +#define PACKAGE_VERSION_MINOR 19 /* Patch version of this package */ -#define PACKAGE_VERSION_PATCHLEVEL 0 +#define PACKAGE_VERSION_PATCHLEVEL 1 /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 diff --git a/pixman/pixman/makefile b/pixman/pixman/makefile index 8209dc394..04ef413f4 100644 --- a/pixman/pixman/makefile +++ b/pixman/pixman/makefile @@ -1,5 +1,7 @@ LIBRARY = libpixman-1 +INCLUDES += $(OBJDIR) + CSRCS = \ pixman-access.c \ pixman-access-accessors.c \ @@ -28,15 +30,15 @@ CSRCS = \ BUILT_SOURCES = pixman-combine32.h pixman-combine32.c pixman-combine64.h pixman-combine64.c -#pixman-combine32.c : pixman-combine.c.template pixman-combine32.h make-combine.pl -# $(PERL) $(srcdir)/make-combine.pl 8 < $(srcdir)/pixman-combine.c.template > $@ || ($(RM) $@; exit 1) -#pixman-combine32.h : pixman-combine.h.template make-combine.pl -# $(PERL) $(srcdir)/make-combine.pl 8 < $(srcdir)/pixman-combine.h.template > $@ || ($(RM) $@; exit 1) +$(OBJDIR)\pixman-combine32.c : pixman-combine.c.template pixman-combine32.h make-combine.pl + perl make-combine.pl 8 < pixman-combine.c.template > $@ +$(OBJDIR)\pixman-combine32.h : pixman-combine.h.template make-combine.pl + perl make-combine.pl 8 < pixman-combine.h.template > $@ -#pixman-combine64.c : pixman-combine.c.template pixman-combine64.h make-combine.pl -# $(PERL) $(srcdir)/make-combine.pl 16 < $(srcdir)/pixman-combine.c.template > $@ || ($(RM) $@; exit 1) -#pixman-combine64.h : pixman-combine.h.template make-combine.pl -# $(PERL) $(srcdir)/make-combine.pl 16 < $(srcdir)/pixman-combine.h.template > $@ || ($(RM) $@; exit 1) +$(OBJDIR)\pixman-combine64.c : pixman-combine.c.template pixman-combine64.h make-combine.pl + perl make-combine.pl 16 < pixman-combine.c.template > $@ +$(OBJDIR)\pixman-combine64.h : pixman-combine.h.template make-combine.pl + perl make-combine.pl 16 < pixman-combine.h.template > $@ ## mmx code #if USE_MMX diff --git a/pixman/pixman/pixman-version.h b/pixman/pixman/pixman-version.h new file mode 100644 index 000000000..70642e961 --- /dev/null +++ b/pixman/pixman/pixman-version.h @@ -0,0 +1,50 @@ +/* + * Copyright © 2008 Red Hat, Inc. + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + * Author: Carl D. Worth <cworth@cworth.org> + */ + +#ifndef PIXMAN_VERSION_H__ +#define PIXMAN_VERSION_H__ + +#ifndef PIXMAN_H__ +# error pixman-version.h should only be included by pixman.h +#endif + +#define PIXMAN_VERSION_MAJOR 0 +#define PIXMAN_VERSION_MINOR 19 +#define PIXMAN_VERSION_MICRO 1 + +#define PIXMAN_VERSION_STRING "0.19.1" + +#define PIXMAN_VERSION_ENCODE(major, minor, micro) ( \ + ((major) * 10000) \ + + ((minor) * 100) \ + + ((micro) * 1)) + +#define PIXMAN_VERSION PIXMAN_VERSION_ENCODE( \ + PIXMAN_VERSION_MAJOR, \ + PIXMAN_VERSION_MINOR, \ + PIXMAN_VERSION_MICRO) + +#endif /* PIXMAN_VERSION_H__ */ -- cgit v1.2.3