ShuriZma
/
snes9x
mirror of https://github.com/snes9xgit/snes9x.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Mac: Update for Xcode 12

This commit is contained in:
Michael Buckley 2020-07-21 14:20:26 -07:00
parent bdd061847e
commit e3e3e287d8
3 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
macosx/mac-snes9x.mm
View File

@ -356,7 +356,7 @@ bool8 SNES9X_RecordMovie (void)
else
opt |= MOVIE_OPT_FROM_SNAPSHOT;
r = S9xMovieCreate(filename, mask, opt, macRecordWChar, wcslen(macRecordWChar));
r = S9xMovieCreate(filename, mask, opt, macRecordWChar, (int)wcslen(macRecordWChar));
if (r == SUCCESS)
{
ChangeTypeAndCreator(filename, 'SMOV', '~9X~');
@ -378,8 +378,6 @@ bool8 SNES9X_RecordMovie (void)
bool8 SNES9X_PlayMovie (void)
{
char filename[PATH_MAX + 1];
if (cartOpen)
{
NSURL *url = NavPlayMovieFrom();
@ -403,14 +401,11 @@ bool8 SNES9X_PlayMovie (void)
bool8 SNES9X_QTMovieRecord (void)
{
char filename[PATH_MAX + 1];
if (cartOpen)
{
NSURL *url = NavQTMovieRecordTo();
if (url != nil)
{
const char *filename = url.path.UTF8String;
macQTRecord = true;
SNES9X_Go();

6
macosx/snes9x.xcodeproj/project.pbxproj
View File

@ -13,7 +13,6 @@
302EEC9C22DAD0AB006D1502 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 302EEC9A22DAD0AB006D1502 /* AudioToolbox.framework */; };
302EEC9D22DAD0AB006D1502 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 302EEC9B22DAD0AB006D1502 /* AudioUnit.framework */; };
302EEC9F22DAD0B1006D1502 /* AGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 302EEC9E22DAD0B1006D1502 /* AGL.framework */; };
302EECA122DAD0B9006D1502 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 302EECA022DAD0B9006D1502 /* OpenGL.framework */; };
302EECA322DAD0C5006D1502 /* CoreImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 302EECA222DAD0C5006D1502 /* CoreImage.framework */; };
302EECA522DAD1B9006D1502 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 302EECA422DAD1B9006D1502 /* CoreAudio.framework */; };
3042F7E3232E9BDD00C03F5E /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3042F7E2232E9BDD00C03F5E /* Carbon.framework */; };
@ -546,7 +545,6 @@
308092F72320B041006A2860 /* CoreGraphics.framework in Frameworks */,
302EECA522DAD1B9006D1502 /* CoreAudio.framework in Frameworks */,
302EECA322DAD0C5006D1502 /* CoreImage.framework in Frameworks */,
302EECA122DAD0B9006D1502 /* OpenGL.framework in Frameworks */,
302EEC9F22DAD0B1006D1502 /* AGL.framework in Frameworks */,
302EEC9C22DAD0AB006D1502 /* AudioToolbox.framework in Frameworks */,
302EEC9D22DAD0AB006D1502 /* AudioUnit.framework in Frameworks */,
@ -1125,7 +1123,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 1030;
LastUpgradeCheck = 1020;
LastUpgradeCheck = 1200;
TargetAttributes = {
30714714230E379500917F82 = {
CreatedOnToolsVersion = 10.3;
@ -1575,6 +1573,7 @@
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@ -1610,6 +1609,7 @@
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;

21
macosx/snes9x.xcodeproj/xcshareddata/xcschemes/snes9x.xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1020"
LastUpgradeVersion = "1200"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
@ -14,7 +14,7 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "30CCAC512290472E00549AED"
BlueprintIdentifier = "30714714230E379500917F82"
BuildableName = "Snes9x.app"
BlueprintName = "Snes9x"
ReferencedContainer = "container:snes9x.xcodeproj">
@ -29,17 +29,6 @@
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "30CCAC512290472E00549AED"
BuildableName = "Snes9x.app"
BlueprintName = "Snes9x"
ReferencedContainer = "container:snes9x.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
@ -55,14 +44,12 @@
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "30CCAC512290472E00549AED"
BlueprintIdentifier = "30714714230E379500917F82"
BuildableName = "Snes9x.app"
BlueprintName = "Snes9x"
ReferencedContainer = "container:snes9x.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
@ -74,7 +61,7 @@
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "30CCAC512290472E00549AED"
BlueprintIdentifier = "30714714230E379500917F82"
BuildableName = "Snes9x.app"
BlueprintName = "Snes9x"
ReferencedContainer = "container:snes9x.xcodeproj">