From b83823f1f17b1f9044f077c4f2cf155db2588613 Mon Sep 17 00:00:00 2001
From: Yoshi Sugawara <yoshi.sugawara@gmail.com>
Date: Sun, 19 Jul 2020 11:42:19 -1000
Subject: [PATCH] Add preprocessor flags for tvOS and other build settings; fix
 compiler errors when building for tvOS sdk

---
 gfx/common/metal/Context.m                     |  2 ++
 .../project.pbxproj                            | 18 ++++++++++++++++++
 ui/drivers/ui_cocoatouch.m                     |  3 +++
 3 files changed, 23 insertions(+)

diff --git a/gfx/common/metal/Context.m b/gfx/common/metal/Context.m
index 1ab4403a04..6b4f2a8851 100644
--- a/gfx/common/metal/Context.m
+++ b/gfx/common/metal/Context.m
@@ -175,6 +175,8 @@
 {
 #if TARGET_OS_OSX
    return _layer.displaySyncEnabled;
+#else
+    return NO;
 #endif
 }
 
diff --git a/pkg/apple/RetroArch_iOS11_Metal.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_iOS11_Metal.xcodeproj/project.pbxproj
index 88d745b7e5..74ba5cad9a 100644
--- a/pkg/apple/RetroArch_iOS11_Metal.xcodeproj/project.pbxproj
+++ b/pkg/apple/RetroArch_iOS11_Metal.xcodeproj/project.pbxproj
@@ -672,6 +672,7 @@
 				LD_NO_PIE = YES;
 				LIBRARY_SEARCH_PATHS = "";
 				MARKETING_VERSION = 1.8.9;
+				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = (
 					"-DDONT_WANT_ARM_OPTIMIZATIONS",
@@ -784,6 +785,7 @@
 				LD_NO_PIE = YES;
 				LIBRARY_SEARCH_PATHS = "";
 				MARKETING_VERSION = 1.8.9;
+				MTL_FAST_MATH = YES;
 				"OTHER_CFLAGS[arch=*]" = (
 					"-DNS_BLOCK_ASSERTIONS=1",
 					"-DNDEBUG",
@@ -896,6 +898,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1.8.9;
 				DEBUG_INFORMATION_FORMAT = dwarf;
+				DEPS_DIR = "$(SRCBASE)/deps";
 				DEVELOPMENT_TEAM = R72X3BF4KE;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -913,6 +916,12 @@
 					../../deps/stb,
 					../../deps/rcheevos/include,
 					../../deps,
+					"$(DEPS_DIR)/glslang",
+					"$(DEPS_DIR)/SPIRV-Cross",
+					"$(DEPS_DIR)/glslang/glslang/glslang/Public",
+					"$(DEPS_DIR)/glslang/glslang/glslang/OSDependent/Unix",
+					"$(DEPS_DIR)/glslang/glslang/SPIRV",
+					"$(DEPS_DIR)/glslang/glslang/glslang/MachineIndependent",
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/tvOS/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -988,6 +997,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = appletvos;
+				SRCBASE = "$(SRCROOT)/../..";
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 12.1;
 			};
@@ -1026,6 +1036,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1.8.9;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEPS_DIR = "$(SRCBASE)/deps";
 				DEVELOPMENT_TEAM = R72X3BF4KE;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -1043,6 +1054,12 @@
 					../../deps/stb,
 					../../deps/rcheevos/include,
 					../../deps,
+					"$(DEPS_DIR)/glslang",
+					"$(DEPS_DIR)/SPIRV-Cross",
+					"$(DEPS_DIR)/glslang/glslang/glslang/Public",
+					"$(DEPS_DIR)/glslang/glslang/glslang/OSDependent/Unix",
+					"$(DEPS_DIR)/glslang/glslang/SPIRV",
+					"$(DEPS_DIR)/glslang/glslang/glslang/MachineIndependent",
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/tvOS/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -1120,6 +1137,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = appletvos;
+				SRCBASE = "$(SRCROOT)/../..";
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 12.1;
 			};
diff --git a/ui/drivers/ui_cocoatouch.m b/ui/drivers/ui_cocoatouch.m
index a1cf2f8fc4..84bb196859 100644
--- a/ui/drivers/ui_cocoatouch.m
+++ b/ui/drivers/ui_cocoatouch.m
@@ -345,7 +345,9 @@ enum
          MetalView *v = [MetalView new];
          v.paused = YES;
          v.enableSetNeedsDisplay = NO;
+#if TARGET_OS_IOS
          v.multipleTouchEnabled = YES;
+#endif
          _renderView = v;
       }
       break;
@@ -390,6 +392,7 @@ enum
 
 - (bool)setDisableDisplaySleep:(bool)disable {
     // no-op for iOS
+    return NO;
 }
 #endif