From a88a76554738f0d7f02f5a1a3a3a0d8b33c2f808 Mon Sep 17 00:00:00 2001 From: Slipp Douglas Thompson Date: Wed, 28 Dec 2022 11:54:18 -0600 Subject: [PATCH] =?UTF-8?q?Fix:=20=5FNoObjCBridge=20implementations=20usin?= =?UTF-8?q?g=20`#if=20!os(=E2=80=A6)`=20for=20non-watchOS/tvOS=20code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixed for real this time. --- Sources/Float4x4/Float4x4_NoObjCBridge.swift | 4 ++-- .../FloatQuaternion_NoObjCBridge.swift | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Sources/Float4x4/Float4x4_NoObjCBridge.swift b/Sources/Float4x4/Float4x4_NoObjCBridge.swift index 4fdcc5b..c36bc3e 100644 --- a/Sources/Float4x4/Float4x4_NoObjCBridge.swift +++ b/Sources/Float4x4/Float4x4_NoObjCBridge.swift @@ -211,7 +211,7 @@ public struct Float4x4 -#if !TARGET_OS_WATCH +#if !os(watchOS) // MARK: CATransform3D Conversion /// Converts a `Float4x4` struct to `CATransform3D` struct using passing-individual-members initialization. @@ -232,7 +232,7 @@ public struct Float4x4 Float(caValue.m41), Float(caValue.m42), Float(caValue.m43), Float(caValue.m44) ) } -#endif // !TARGET_OS_WATCH +#endif // !watchOS diff --git a/Sources/FloatQuaternion/FloatQuaternion_NoObjCBridge.swift b/Sources/FloatQuaternion/FloatQuaternion_NoObjCBridge.swift index 038b3af..d2d6f61 100644 --- a/Sources/FloatQuaternion/FloatQuaternion_NoObjCBridge.swift +++ b/Sources/FloatQuaternion/FloatQuaternion_NoObjCBridge.swift @@ -63,7 +63,7 @@ public struct FloatQuaternion -#if !TARGET_OS_WATCH +#if !os(watchOS) // MARK: GLKit Conversion /// Converts a `FloatQuaternion` struct to `GLKQuaternion` struct using passing-individual-members initialization. @@ -74,11 +74,11 @@ public struct FloatQuaternion @_transparent public func FloatQuaternionFromGLK(_ glkValue:GLKQuaternion) -> FloatQuaternion { return FloatQuaternion(ix: glkValue.x, iy: glkValue.y, iz: glkValue.z, r: glkValue.w) } -#endif // !TARGET_OS_WATCH +#endif // !watchOS -#if !TARGET_OS_TV +#if !os(tvOS) // MARK: CoreMotion Conversion /// Converts a `FloatQuaternion` struct to `CMQuaternion` struct using passing-individual-members initialization. @@ -89,11 +89,11 @@ public struct FloatQuaternion @_transparent public func FloatQuaternionFromCM(_ cmValue:CMQuaternion) -> FloatQuaternion { return FloatQuaternion(ix: Float(cmValue.x), iy: Float(cmValue.y), iz: Float(cmValue.z), r: Float(cmValue.w)) } -#endif // !TARGET_OS_TV +#endif // !tvOS -#if !TARGET_OS_WATCH +#if !os(watchOS) // MARK: GameController Conversion /// Converts a `FloatQuaternion` struct to `GCQuaternion` struct using passing-individual-members initialization. @@ -104,4 +104,4 @@ public struct FloatQuaternion @_transparent public func FloatQuaternionFromGC(_ gcValue:GCQuaternion) -> FloatQuaternion { return FloatQuaternion(ix: Float(gcValue.x), iy: Float(gcValue.y), iz: Float(gcValue.z), r: Float(gcValue.w)) } -#endif // !TARGET_OS_WATCH +#endif // !watchOS