diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-12-19 09:42:32 +0100 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-12-19 09:42:32 +0100 |
| commit | b4c74957cbec8ce1fab512983f5133223376545e (patch) | |
| tree | 16307baf9ae3cbd5a09620a3e6d690666caa28df /cairo | |
| parent | e81e5108b90340419264fa2562cc6b96837fee52 (diff) | |
Fix MMX build of pixman with MSVC
Diffstat (limited to 'cairo')
| -rw-r--r-- | cairo/pixman-0.24.0.patch | 20 | ||||
| -rw-r--r-- | cairo/pixman/makefile.mk | 2 |
2 files changed, 21 insertions, 1 deletions
diff --git a/cairo/pixman-0.24.0.patch b/cairo/pixman-0.24.0.patch index 61ef416ae890..a6141ac4b154 100644 --- a/cairo/pixman-0.24.0.patch +++ b/cairo/pixman-0.24.0.patch @@ -122,4 +122,24 @@ #include "pixman-private.h" +--- misc/pixman-0.24.0/pixman/pixman-mmx.c 2011-11-06 13:47:42.000000000 -0700 ++++ misc/build/pixman-0.24.0/pixman/pixman-mmx.c 2011-12-19 00:41:42.280402800 -0700 +@@ -309,7 +309,7 @@ + + /* Elemental unaligned loads */ + +-static __inline__ __m64 ldq_u(uint64_t *p) ++static inline __m64 ldq_u(uint64_t *p) + { + #ifdef USE_X86_MMX + /* x86's alignment restrictions are very relaxed. */ +@@ -328,7 +328,7 @@ + #endif + } + +-static __inline__ uint32_t ldl_u(uint32_t *p) ++static inline uint32_t ldl_u(uint32_t *p) + { + #ifdef USE_X86_MMX + /* x86's alignment restrictions are very relaxed. */ diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk index dcd489d40a52..44ea09bdc137 100644 --- a/cairo/pixman/makefile.mk +++ b/cairo/pixman/makefile.mk @@ -74,7 +74,7 @@ BUILD_DIR=$(CONFIGURE_DIR) .ELSE # WNT, not GCC BUILD_DIR=pixman -BUILD_ACTION=$(GNUMAKE) -f Makefile.win32 MMX=off SSE2=on CFG=release +BUILD_ACTION=$(GNUMAKE) -f Makefile.win32 MMX=on SSE2=on CFG=release .ENDIF .ELIF "$(GUIBASE)"=="aqua" |