Bladeren bron

Upgrade to latest Android NDK & fix warning (#741)

Jorrit Rouwe 1 jaar geleden
bovenliggende
commit
912bdbafb9
3 gewijzigde bestanden met toevoegingen van 3 en 3 verwijderingen
  1. 1 1
      Build/Android/PerformanceTest/build.gradle
  2. 1 1
      Build/Android/UnitTests/build.gradle
  3. 1 1
      Jolt/Core/Core.h

+ 1 - 1
Build/Android/PerformanceTest/build.gradle

@@ -4,7 +4,7 @@ plugins {
 
 android {
     compileSdk 33
-    ndkVersion "25.0.8775105"
+    ndkVersion "26.1.10909125"
 
     defaultConfig {
         applicationId "com.joltphysics.performancetest"

+ 1 - 1
Build/Android/UnitTests/build.gradle

@@ -4,7 +4,7 @@ plugins {
 
 android {
     compileSdk 33
-    ndkVersion "25.0.8775105"
+    ndkVersion "26.1.10909125"
 
     defaultConfig {
         applicationId "com.joltphysics.unittests"

+ 1 - 1
Jolt/Core/Core.h

@@ -500,7 +500,7 @@ static_assert(sizeof(void *) == (JPH_CPU_ADDRESS_BITS == 64? 8 : 4), "Invalid si
 #elif defined(JPH_COMPILER_CLANG)
 	// We compile without -ffast-math because pragma float_control(precise, on) doesn't seem to actually negate all of the -ffast-math effects and causes the unit tests to fail (even if the pragma is added to all files)
 	// On clang 14 and later we can turn off float contraction through a pragma (before it was buggy), so if FMA is on we can disable it through this macro
-	#if (defined(JPH_CPU_ARM) && __clang_major__ >= 16) || (defined(JPH_CPU_X86) && __clang_major__ >= 14)
+	#if (defined(JPH_CPU_ARM) && !defined(JPH_PLATFORM_ANDROID) && __clang_major__ >= 16) || (defined(JPH_CPU_X86) && __clang_major__ >= 14)
 		#define JPH_PRECISE_MATH_ON						\
 			_Pragma("float_control(precise, on, push)")	\
 			_Pragma("clang fp contract(off)")