diff --git a/neo/framework/BuildDefines.h b/neo/framework/BuildDefines.h index 8f0bbaf..91dac87 100644 --- a/neo/framework/BuildDefines.h +++ b/neo/framework/BuildDefines.h @@ -126,10 +126,6 @@ If you have questions concerning this license or the applicable additional terms #endif #ifndef ID_ALLOW_D3XP -# if defined( MACOS_X ) -# define ID_ALLOW_D3XP 0 -# else -# define ID_ALLOW_D3XP 1 -# endif +# define ID_ALLOW_D3XP 1 #endif diff --git a/neo/idlib/containers/VectorSet.h b/neo/idlib/containers/VectorSet.h index f68e4fb..7d64601 100644 --- a/neo/idlib/containers/VectorSet.h +++ b/neo/idlib/containers/VectorSet.h @@ -148,7 +148,7 @@ ID_INLINE int idVectorSet::FindVector( const type &v, const floa } hash.Add( hashKey, idList::Num() ); - Append( v ); + this->Append( v ); return idList::Num()-1; } diff --git a/neo/idlib/math/Curve.h b/neo/idlib/math/Curve.h index 6defa90..63b1322 100644 --- a/neo/idlib/math/Curve.h +++ b/neo/idlib/math/Curve.h @@ -333,7 +333,7 @@ idCurve::SetConstantSpeed */ template< class type > ID_INLINE void idCurve::SetConstantSpeed( const float totalTime ) { - int i, j; + int i; float *length, totalLength, scale, t; length = (float *) _alloca16( values.Num() * sizeof( float ) ); @@ -777,7 +777,7 @@ idCurve_QuadraticBezier::BasisSecondDerivative */ template< class type > ID_INLINE void idCurve_QuadraticBezier::BasisSecondDerivative( const float t, float *bvals ) const { - float s1 = (float) ( t - this->times[0] ) / ( this->times[2] - this->times[0] ); +// float s1 = (float) ( t - this->times[0] ) / ( this->times[2] - this->times[0] ); bvals[0] = 2.0f; bvals[1] = -4.0f; bvals[2] = 2.0f; diff --git a/neo/idlib/math/Math.h b/neo/idlib/math/Math.h index 415f86e..1037a57 100644 --- a/neo/idlib/math/Math.h +++ b/neo/idlib/math/Math.h @@ -31,7 +31,9 @@ If you have questions concerning this license or the applicable additional terms #ifdef MACOS_X // for square root estimate instruction +#ifdef PPC_INTRINSICS #include +#endif // for FLT_MIN #include #endif diff --git a/neo/idlib/math/Simd_AltiVec.h b/neo/idlib/math/Simd_AltiVec.h index 3f87cca..9b13992 100644 --- a/neo/idlib/math/Simd_AltiVec.h +++ b/neo/idlib/math/Simd_AltiVec.h @@ -93,7 +93,7 @@ If you have questions concerning this license or the applicable additional terms // This turns on support for PPC intrinsics in the SIMD_AltiVec.cpp file. Right now it's only used for frsqrte. GCC // supports these intrinsics but XLC does not. -#define PPC_INTRINSICS +//#define PPC_INTRINSICS // This assumes that the idDrawVert array that is used in DeriveUnsmoothedTangents is aligned. If its not aligned, // then we don't get any speedup diff --git a/neo/sound/snd_system.cpp b/neo/sound/snd_system.cpp index bc42bf4..359eeea 100644 --- a/neo/sound/snd_system.cpp +++ b/neo/sound/snd_system.cpp @@ -164,7 +164,7 @@ void ListSounds_f( const idCmdArgs &args ) { common->Printf( "%8d total samples loaded\n", totalSamples ); common->Printf( "%8d kB total system memory used\n", totalMemory >> 10 ); #if ID_OPENAL - common->Printf( "%8d kB total OpenAL audio memory used\n", ( alGetInteger( alGetEnumValue( (ALubyte*)"AL_EAX_RAM_SIZE" ) ) - alGetInteger( alGetEnumValue( (ALubyte*)"AL_EAX_RAM_FREE" ) ) ) >> 10 ); + common->Printf( "%8d kB total OpenAL audio memory used\n", ( alGetInteger( alGetEnumValue( "AL_EAX_RAM_SIZE" ) ) - alGetInteger( alGetEnumValue( "AL_EAX_RAM_FREE" ) ) ) >> 10 ); #endif } diff --git a/neo/sys/osx/DOOMController.mm b/neo/sys/osx/DOOMController.mm index 195c18a..81d34f0 100644 --- a/neo/sys/osx/DOOMController.mm +++ b/neo/sys/osx/DOOMController.mm @@ -43,7 +43,7 @@ If you have questions concerning this license or the applicable additional terms #import "macosx_sys.h" #import -#import +#import #import #define MAX_KEYS 256 @@ -467,13 +467,13 @@ Sys_GetProcessorId =============== */ cpuid_t Sys_GetProcessorId( void ) { - cpuid_t cpuid = CPUID_GENERIC; + int cpuid = CPUID_GENERIC; #if defined(__ppc__) cpuid |= CPUID_ALTIVEC; #elif defined(__i386__) cpuid |= CPUID_INTEL | CPUID_MMX | CPUID_SSE | CPUID_SSE2 | CPUID_SSE3 | CPUID_HTT | CPUID_CMOV | CPUID_FTZ | CPUID_DAZ; #endif - return cpuid; + return static_cast(cpuid); } /*