libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-24 08:30:16 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Merge pull request #10031 from yoshisuga/tvos-fix-compiler-flag

Browse Source 
tvOS: fix preprocessor flag; update version in Info.plist
This commit is contained in:
Twinaphex 2020-01-19 07:12:06 +01:00 committed by GitHub
commit 4e2f2e0458
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
audio/drivers/coreaudio.c
View File

@ -371,7 +371,7 @@ static ssize_t coreaudio_write(void *data, const void *buf_, size_t size)
break; break;
} }
#if TARGET_OS_IPHONE #if TARGET_OS_IOS
if (write_avail == 0 && !scond_wait_timeout( if (write_avail == 0 && !scond_wait_timeout(
dev->cond, dev->lock, 3000000)) dev->cond, dev->lock, 3000000))
g_interrupted = true; g_interrupted = true;

16
pkg/apple/RetroArch_iOS11.xcodeproj/project.pbxproj
View File

@ -614,7 +614,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_RESOURCE_RULES_PATH = "$(SDKROOT)/ResourceRules.plist"; CODE_SIGN_RESOURCE_RULES_PATH = "$(SDKROOT)/ResourceRules.plist";
CURRENT_PROJECT_VERSION = 1.8.1; CURRENT_PROJECT_VERSION = 1.8.4;
DEVELOPMENT_TEAM = BJ7B9HU3GU; DEVELOPMENT_TEAM = BJ7B9HU3GU;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO;
@ -631,7 +631,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 11.0; IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_NO_PIE = YES; LD_NO_PIE = YES;
LIBRARY_SEARCH_PATHS = ""; LIBRARY_SEARCH_PATHS = "";
MARKETING_VERSION = 1.8.1; MARKETING_VERSION = 1.8.4;
ONLY_ACTIVE_ARCH = NO; ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = ( OTHER_CFLAGS = (
"-DDONT_WANT_ARM_OPTIMIZATIONS", "-DDONT_WANT_ARM_OPTIMIZATIONS",
@ -708,7 +708,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_RESOURCE_RULES_PATH = "$(SDKROOT)/ResourceRules.plist"; CODE_SIGN_RESOURCE_RULES_PATH = "$(SDKROOT)/ResourceRules.plist";
CURRENT_PROJECT_VERSION = 1.8.1; CURRENT_PROJECT_VERSION = 1.8.4;
DEVELOPMENT_TEAM = BJ7B9HU3GU; DEVELOPMENT_TEAM = BJ7B9HU3GU;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO;
@ -725,7 +725,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 11.0; IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_NO_PIE = YES; LD_NO_PIE = YES;
LIBRARY_SEARCH_PATHS = ""; LIBRARY_SEARCH_PATHS = "";
MARKETING_VERSION = 1.8.1; MARKETING_VERSION = 1.8.4;
"OTHER_CFLAGS[arch=*]" = ( "OTHER_CFLAGS[arch=*]" = (
"-DNS_BLOCK_ASSERTIONS=1", "-DNS_BLOCK_ASSERTIONS=1",
"-DNDEBUG", "-DNDEBUG",
@ -826,7 +826,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN_UNREACHABLE_CODE = YES;
CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1.8.1; CURRENT_PROJECT_VERSION = 1.8.4;
DEBUG_INFORMATION_FORMAT = dwarf; DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = BJ7B9HU3GU; DEVELOPMENT_TEAM = BJ7B9HU3GU;
ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_STRICT_OBJC_MSGSEND = YES;
@ -848,7 +848,7 @@
); );
INFOPLIST_FILE = "$(SRCROOT)/tvOS/Info.plist"; INFOPLIST_FILE = "$(SRCROOT)/tvOS/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 1.8.1; MARKETING_VERSION = 1.8.4;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES; MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
@ -948,7 +948,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN_UNREACHABLE_CODE = YES;
CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1.8.1; CURRENT_PROJECT_VERSION = 1.8.4;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = BJ7B9HU3GU; DEVELOPMENT_TEAM = BJ7B9HU3GU;
ENABLE_NS_ASSERTIONS = NO; ENABLE_NS_ASSERTIONS = NO;
@ -970,7 +970,7 @@
); );
INFOPLIST_FILE = "$(SRCROOT)/tvOS/Info.plist"; INFOPLIST_FILE = "$(SRCROOT)/tvOS/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 1.8.1; MARKETING_VERSION = 1.8.4;
MTL_ENABLE_DEBUG_INFO = NO; MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES; MTL_FAST_MATH = YES;
OTHER_CFLAGS = ( OTHER_CFLAGS = (