diff --git a/lib/mac/mathlib_i486.a b/lib/mac/mathlib_i486.a index 663cd7aa..4504c488 100644 Binary files a/lib/mac/mathlib_i486.a and b/lib/mac/mathlib_i486.a differ diff --git a/lib/mac/tier1_i486.a b/lib/mac/tier1_i486.a index c0f2cdde..51086ed5 100644 Binary files a/lib/mac/tier1_i486.a and b/lib/mac/tier1_i486.a differ diff --git a/linux_sdk/Makefile b/linux_sdk/Makefile index dd3dd73b..94616bf2 100644 --- a/linux_sdk/Makefile +++ b/linux_sdk/Makefile @@ -92,7 +92,7 @@ SHLIBSUFFIX = endif DEFINES +=-DVPROF_LEVEL=1 -DSWDS -D_finite=finite -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp \ - -Dstrnicmp=strncasecmp -D_vsnprintf=vsnprintf -D_alloca=alloca -Dstrcmpi=strcasecmp + -Dstrnicmp=strncasecmp -D_vsnprintf=vsnprintf -D_alloca=alloca -Dstrcmpi=strcasecmp -DPOSIX -DNO_MALLOC_OVERRIDE -DNO_HOOK_MALLOC UNDEF = -Usprintf -Ustrncpy -UPROTECTED_THINGS_ENABLE BASE_CFLAGS = -fno-strict-aliasing -Wall -Wsign-compare -Werror -Wno-conversion -Wno-overloaded-virtual -Wno-non-virtual-dtor -Wno-invalid-offsetof \ diff --git a/mathlib/sse.cpp b/mathlib/sse.cpp index d39c24f8..a0e166c2 100644 --- a/mathlib/sse.cpp +++ b/mathlib/sse.cpp @@ -16,8 +16,10 @@ // memdbgon must be the last include file in a .cpp file!!! #include "tier0/memdbgon.h" +#ifdef _WIN32 static const uint32 _sincos_masks[] = { (uint32)0x0, (uint32)~0x0 }; static const uint32 _sincos_inv_masks[] = { (uint32)~0x0, (uint32)0x0 }; +#endif //----------------------------------------------------------------------------- // Macros and constants required by some of the SSE assembly: @@ -49,6 +51,7 @@ static const uint32 _sincos_inv_masks[] = { (uint32)~0x0, (uint32)0x0 }; static const __attribute__((aligned(16))) float _ps_##Name[4] = { Val, Val, Val, Val } #endif +#ifdef _WIN32 _PS_EXTERN_CONST(am_0, 0.0f); _PS_EXTERN_CONST(am_1, 1.0f); _PS_EXTERN_CONST(am_m1, -1.0f); @@ -72,6 +75,7 @@ _PS_CONST(sincos_p0, 0.15707963267948963959e1f); _PS_CONST(sincos_p1, -0.64596409750621907082e0f); _PS_CONST(sincos_p2, 0.7969262624561800806e-1f); _PS_CONST(sincos_p3, -0.468175413106023168e-2f); +#endif #ifdef PFN_VECTORMA void __cdecl _SSE_VectorMA( const float *start, float scale, const float *direction, float *dest ); diff --git a/mathlib/sseconst.cpp b/mathlib/sseconst.cpp index 662943be..31d40906 100644 --- a/mathlib/sseconst.cpp +++ b/mathlib/sseconst.cpp @@ -30,6 +30,7 @@ const fltx4 Four_FLT_MAX={FLT_MAX,FLT_MAX,FLT_MAX,FLT_MAX}; const fltx4 Four_Negative_FLT_MAX={-FLT_MAX,-FLT_MAX,-FLT_MAX,-FLT_MAX}; const fltx4 g_SIMD_0123 = { 0., 1., 2., 3. }; +#ifdef _X360 const fltx4 g_QuatMultRowSign[4] = { { 1.0f, 1.0f, -1.0f, 1.0f }, @@ -37,6 +38,7 @@ const fltx4 g_QuatMultRowSign[4] = { 1.0f, -1.0f, 1.0f, 1.0f }, { -1.0f, -1.0f, -1.0f, 1.0f } }; +#endif const int32 ALIGN16 g_SIMD_clear_signmask[4]= {0x7fffffff,0x7fffffff,0x7fffffff,0x7fffffff}; const int32 ALIGN16 g_SIMD_signmask[4]= { 0x80000000, 0x80000000, 0x80000000, 0x80000000 }; diff --git a/public/tier0/memdbgon.h b/public/tier0/memdbgon.h index 34f7550b..13b4ed42 100644 --- a/public/tier0/memdbgon.h +++ b/public/tier0/memdbgon.h @@ -35,7 +35,7 @@ #include #endif #include - #include + #include #include "tier0/valve_on.h" #include "commonmacros.h" diff --git a/tier1/bitbuf.cpp b/tier1/bitbuf.cpp index f49f5ea0..fbaf4e86 100644 --- a/tier1/bitbuf.cpp +++ b/tier1/bitbuf.cpp @@ -867,7 +867,9 @@ int old_bf_read::ReadSBitLong( int numbits ) } const byte g_BitMask[8] = {0x1, 0x2, 0x4, 0x8, 0x10, 0x20, 0x40, 0x80}; +#if FAST_BIT_SCAN const byte g_TrailingMask[8] = {0xff, 0xfe, 0xfc, 0xf8, 0xf0, 0xe0, 0xc0, 0x80}; +#endif inline int old_bf_read::CountRunOfZeros() {