X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=xbmc%2Futils%2FMathUtils.h;h=9a6fb09bb3e070a0e0ffd9756aa26849a0c25898;hb=063a4b6faaf84ae5beaab2fcd76f97ddeeb4da2d;hp=c95171ff4d012e5c0b64be07e26cb5e1c05ad181;hpb=0558f5eca64e3b26f017cbf72682e96e03987a76;p=vuplus_xbmc diff --git a/xbmc/utils/MathUtils.h b/xbmc/utils/MathUtils.h index c95171f..9a6fb09 100644 --- a/xbmc/utils/MathUtils.h +++ b/xbmc/utils/MathUtils.h @@ -1,7 +1,7 @@ #pragma once /* - * Copyright (C) 2005-2012 Team XBMC - * http://www.xbmc.org + * Copyright (C) 2005-2013 Team XBMC + * http://xbmc.org * * This Program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -34,17 +34,17 @@ #if defined(__ppc__) || \ defined(__powerpc__) || \ - (defined(__APPLE__) && defined(__arm__) && defined(__llvm__)) || \ - (defined(__ANDROID__) && defined(__arm__)) || \ - defined(TARGET_RASPBERRY_PI) + (defined(TARGET_DARWIN_IOS) && defined(__llvm__)) || \ + (defined(TARGET_ANDROID) && defined(__arm__)) || \ + defined(TARGET_RASPBERRY_PI) || defined(TARGET_DVBBOX) // oskwon #define DISABLE_MATHUTILS_ASM_ROUND_INT #endif #if defined(__ppc__) || \ defined(__powerpc__) || \ - (defined(__APPLE__) && defined(__llvm__)) || \ - (defined(__ANDROID__) && defined(__arm__)) || \ - defined(TARGET_RASPBERRY_PI) + (defined(TARGET_DARWIN) && defined(__llvm__)) || \ + (defined(TARGET_ANDROID) && defined(__arm__)) || \ + defined(TARGET_RASPBERRY_PI) || defined(TARGET_DVBBOX) // oskwon #define DISABLE_MATHUTILS_ASM_TRUNCATE_INT #endif @@ -130,7 +130,7 @@ namespace MathUtils const float round_dn_to_nearest = 0.4999999f; i = (x > 0) ? _mm_cvttsd_si32(_mm_set_sd(x + round_to_nearest)) : _mm_cvttsd_si32(_mm_set_sd(x - round_dn_to_nearest)); -#elif defined(_WIN32) +#elif defined(TARGET_WINDOWS) __asm { fld x @@ -178,7 +178,7 @@ namespace MathUtils ); return i; -#elif defined(_WIN32) +#elif defined(TARGET_WINDOWS) const float round_towards_m_i = -0.5f; __asm {