mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-28 12:40:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add preprocessor flags for tvOS and other build settings; fix compiler errors when building for tvOS sdk

Browse Source
This commit is contained in:
Yoshi Sugawara 2020-07-19 11:42:19 -10:00
parent 941a488733
commit b83823f1f1
3 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/common/metal/Context.m
View File

@ -175,6 +175,8 @@
{
#if TARGET_OS_OSX
return _layer.displaySyncEnabled;
#else
return NO;
#endif
}

18
pkg/apple/RetroArch_iOS11_Metal.xcodeproj/project.pbxproj
View File

@ -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;
};

3
ui/drivers/ui_cocoatouch.m
View File

@ -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