revert __APPLE__ macro replacement

turanszkij · Oct 12, 2024 · 18356b1 · 18356b1
1 parent f7612d9
commit 18356b1
Show file tree

Hide file tree

Showing 15 changed files with 141 additions and 141 deletions.
diff --git a/Editor/json.hpp b/Editor/json.hpp
@@ -17150,7 +17150,7 @@ class basic_json
         result["platform"] = "win32";
 #elif defined __linux__
         result["platform"] = "linux";
-#elif defined SDL_PLATFORM_APPLE
+#elif defined __APPLE__
         result["platform"] = "apple";
 #elif defined __unix__
         result["platform"] = "unix";

diff --git a/Editor/tiny_gltf.h b/Editor/tiny_gltf.h
@@ -1424,7 +1424,7 @@ class TinyGLTF {
   bool preserve_image_channels_ = false;  /// Default false(expand channels to
                                           /// RGBA) for backward compatibility.
 
-  // Warning & error messages 
+  // Warning & error messages
   std::string warn_;
   std::string err_;
 
@@ -1701,7 +1701,7 @@ void JsonParse(JsonDocument &doc, const char *str, size_t length,
 }
 }  // namespace
 
-#ifdef SDL_PLATFORM_APPLE
+#ifdef __APPLE__
 #include "TargetConditionals.h"
 #endif
 

diff --git a/Editor/ufbx.c b/Editor/ufbx.c
@@ -465,7 +465,7 @@
 #define ufbxi_read_u8(ptr) (*(const uint8_t*)(ptr))
 
 // Detect support for `__attribute__((aligned(1)))`
-#if !defined(UFBX_STANDARD_C) && (defined(__clang__) && defined(SDL_PLATFORM_APPLE))
+#if !defined(UFBX_STANDARD_C) && (defined(__clang__) && defined(__APPLE__))
 	// Apple overrides Clang versioning, 5.0 here maps to 3.3
 	#if __clang_major__ >= 5
 		#define UFBXI_HAS_ATTRIBUTE_ALIGNED 1

diff --git a/WickedEngine/Jolt/Core/Core.h b/WickedEngine/Jolt/Core/Core.h
@@ -85,7 +85,7 @@
 	#define JPH_PLATFORM_LINUX
 #elif defined(__FreeBSD__)
 	#define JPH_PLATFORM_FREEBSD
-#elif defined(SDL_PLATFORM_APPLE)
+#elif defined(__APPLE__)
 	#include <TargetConditionals.h>
 	#if defined(TARGET_OS_IPHONE) && !TARGET_OS_IPHONE
 		#define JPH_PLATFORM_MACOS

diff --git a/WickedEngine/Utility/DirectXMath.h b/WickedEngine/Utility/DirectXMath.h
@@ -116,7 +116,7 @@
 // C4514/4820: Off by default noise
 #include <math.h>
 #include <float.h>
-#ifndef SDL_PLATFORM_APPLE
+#ifndef __APPLE__
 #	include <malloc.h>
 #endif
 #ifdef _MSC_VER

diff --git a/WickedEngine/Utility/DirectXMathCommon.h b/WickedEngine/Utility/DirectXMathCommon.h
@@ -16,7 +16,7 @@
 
 #if defined(_WIN32)
 #   define BUILD_PLATFORM_WIN 1
-#elif defined(SDL_PLATFORM_APPLE)
+#elif defined(__APPLE__)
 #   include "TargetConditionals.h"
 #   if defined(TARGET_OS_IPHONE)
 #       define BUILD_PLATFORM_IOS 1