[ogre/f16] Supplied patch adjusted for ogre 1.7
Bruno Wolff III
bruno at fedoraproject.org
Sun Jul 22 13:35:11 UTC 2012
commit 8df00e08a31503d5136d0559ff462de8e15e15c7
Author: Bruno Wolff III <bruno at wolff.to>
Date: Sat Jul 21 08:36:06 2012 -0500
Supplied patch adjusted for ogre 1.7
I think the submitted patch might have been against ogre 1.8.
ogre-fix-utilSSE.patch | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
---
diff --git a/ogre-fix-utilSSE.patch b/ogre-fix-utilSSE.patch
index 6eb1bb9..5f7a983 100644
--- a/ogre-fix-utilSSE.patch
+++ b/ogre-fix-utilSSE.patch
@@ -1,13 +1,10 @@
-# This patch is from Al Reay in bug 842041. It is based on the discussion at:
-# http://www.ogre3d.org/forums/viewtopic.php?f=2&t=70052
-
---- OgreMain/src/OgreSIMDHelper.h 2012-07-03 21:01:01.831381577 +1200
-+++ OgreMain/src/OgreSIMDHelper.h 2012-07-03 21:01:32.506998075 +1200
+--- OgreMain/src/OgreSIMDHelper.h.orig 2012-07-21 08:31:41.148789309 -0500
++++ OgreMain/src/OgreSIMDHelper.h 2012-07-21 08:32:56.665387072 -0500
@@ -48,7 +48,7 @@
// thing. The size of the allocated block seems to be irrelevant.
#define __OGRE_SIMD_ALIGN_STACK() _alloca(16)
--#elif OGRE_CPU == OGRE_CPU_X86 && (OGRE_COMPILER == OGRE_COMPILER_GNUC || OGRE_COMPILER == OGRE_COMPILER_CLANG)
+-#elif OGRE_CPU == OGRE_CPU_X86 && OGRE_COMPILER == OGRE_COMPILER_GNUC
+#elif OGRE_CPU == OGRE_CPU_X86 && OGRE_COMPILER == OGRE_COMPILER_CLANG
//
// Horrible hack to align the stack to a 16-bytes boundary for gcc.
More information about the scm-commits
mailing list