diff options
| author | marha <marha@users.sourceforge.net> | 2012-05-21 09:28:15 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-05-21 09:28:15 +0200 |
| commit | d4b066581bc9a4bf7b0a5ffa11ff0adb47d2075c (patch) | |
| tree | db56fe01d61a824e4bd975cbf8603b11e9c5ecdf /pixman | |
| parent | d2dacc6bc44f7dc245dee6e66723013afb49cfb5 (diff) | |
| parent | f543ceaca6820260f15a4eff86938214cf43c7d2 (diff) | |
| download | vcxsrv-d4b066581bc9a4bf7b0a5ffa11ff0adb47d2075c.tar.gz vcxsrv-d4b066581bc9a4bf7b0a5ffa11ff0adb47d2075c.tar.bz2 vcxsrv-d4b066581bc9a4bf7b0a5ffa11ff0adb47d2075c.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'pixman')
| -rw-r--r-- | pixman/configure.ac | 5 | ||||
| -rw-r--r-- | pixman/demos/Makefile.am | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/pixman/configure.ac b/pixman/configure.ac index d9498397b..027a1680e 100644 --- a/pixman/configure.ac +++ b/pixman/configure.ac @@ -54,7 +54,7 @@ AC_PREREQ([2.57]) m4_define([pixman_major], 0) m4_define([pixman_minor], 25) -m4_define([pixman_micro], 3) +m4_define([pixman_micro], 7) m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro]) @@ -619,6 +619,9 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ #ifndef __arm__ #error "IWMMXT is only available on ARM" #endif +#ifndef __IWMMXT__ +#error "IWMMXT not enabled (with -march=iwmmxt)" +#endif #if defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)) #error "Need GCC >= 4.5 for IWMMXT intrinsics" #endif diff --git a/pixman/demos/Makefile.am b/pixman/demos/Makefile.am index a664d939e..9aac1f5e9 100644 --- a/pixman/demos/Makefile.am +++ b/pixman/demos/Makefile.am @@ -22,6 +22,8 @@ DEMOS = \ quad2quad \ checkerboard +EXTRA_DIST = parrot.c parrot.jpg + gradient_test_SOURCES = gradient-test.c $(GTK_UTILS) alpha_test_SOURCES = alpha-test.c $(GTK_UTILS) composite_test_SOURCES = composite-test.c $(GTK_UTILS) |