From faa88362db65798611f775d9925d526d00d69b8b Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Tue, 21 Feb 2006 04:52:39 +0000 Subject: [PATCH] disable GSL vector lib on MacOS x86 --- stepmania/src/RageMath.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/stepmania/src/RageMath.cpp b/stepmania/src/RageMath.cpp index e1dfea1878..48a36d2317 100644 --- a/stepmania/src/RageMath.cpp +++ b/stepmania/src/RageMath.cpp @@ -13,8 +13,13 @@ #include "arch/Dialog/Dialog.h" #include -#if defined(MACOSX) +#if defined(MACOSX) && defined(__ppc__) +# define USE_VECLIB +#endif + +#if defined(USE_VECLIB) // Work around global namespace pollution. +// www.gnu.org/software/gsl/manual/gsl-ref_43.html namespace vblas { # include @@ -90,7 +95,7 @@ void RageVec3TransformNormal( RageVector3* pOut, const RageVector3* pV, const Ra void RageVec4TransformCoord( RageVector4* pOut, const RageVector4* pV, const RageMatrix* pM ) { -#if defined(MACOSX) +#if defined(USE_VECLIB) // (M^t * v)^t = v^t * M cblas_sgemv(CblasRowMajor, CblasTrans, 4, 4, 1, &pM->m00, 4, &pV->x, 1, 0, &pOut->x, 1); @@ -135,7 +140,7 @@ RageMatrix RageMatrix::GetTranspose() const void RageMatrixMultiply( RageMatrix* pOut, const RageMatrix* pA, const RageMatrix* pB ) { -#if defined(MACOSX) +#if defined(USE_VECLIB) cblas_sgemm(CblasRowMajor, CblasNoTrans, CblasNoTrans, 4, 4, 4, 1, &pB->m00, 4, &pA->m00, 4, 0, &pOut->m00, 4); #else