From c9b4aa26227ab438503f654ac839b4072732945f Mon Sep 17 00:00:00 2001 From: neville Date: Sun, 29 Mar 2015 18:09:15 +0200 Subject: [PATCH] (OSX PPC) Build fixes --- apple/OSX/platform.m | 2 +- .../RetroArch_OSX.xcodeproj/project.pbxproj | 24 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/apple/OSX/platform.m b/apple/OSX/platform.m index 816fd2a7dc..24cbec8592 100644 --- a/apple/OSX/platform.m +++ b/apple/OSX/platform.m @@ -253,7 +253,7 @@ static void poll_iteration(void) NSApplicationTerminateReply reply = NSTerminateNow; global_t *global = global_get_ptr(); - if (global->main_is_init) + if (global && global->main_is_init) reply = NSTerminateCancel; rarch_main_command(RARCH_CMD_QUIT); diff --git a/apple/OSXPPC/RetroArch_OSX.xcodeproj/project.pbxproj b/apple/OSXPPC/RetroArch_OSX.xcodeproj/project.pbxproj index 976b1bcfd3..9c5228eee6 100644 --- a/apple/OSXPPC/RetroArch_OSX.xcodeproj/project.pbxproj +++ b/apple/OSXPPC/RetroArch_OSX.xcodeproj/project.pbxproj @@ -8,8 +8,8 @@ /* Begin PBXBuildFile section */ 7A804DFD1A1A8EF7004D8B7F /* CFExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = 7A804DFC1A1A8EF7004D8B7F /* CFExtensions.m */; }; - 7A899AB21A1A990C00B4EB56 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7A899AB01A1A990C00B4EB56 /* MainMenu.xib */; }; - 7A899ACB1A1AB18C00B4EB56 /* Settings.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7A899AC91A1AB18C00B4EB56 /* Settings.xib */; }; + 7A868DD51AC85A8500B0EDDB /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7A868DD11AC85A8500B0EDDB /* MainMenu.xib */; }; + 7A868DD61AC85A8500B0EDDB /* Settings.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7A868DD31AC85A8500B0EDDB /* Settings.xib */; }; 7AEFCD7D192128EA00FB5B6A /* utility.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AEFCD7C192128EA00FB5B6A /* utility.m */; }; 7AEFCD7F192128FE00FB5B6A /* RAGameView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AEFCD7E192128FE00FB5B6A /* RAGameView.m */; }; 7AEFCD831921292900FB5B6A /* platform.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AEFCD821921292900FB5B6A /* platform.m */; }; @@ -28,8 +28,8 @@ /* Begin PBXFileReference section */ 7A804DFC1A1A8EF7004D8B7F /* CFExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CFExtensions.m; path = ../common/CFExtensions.m; sourceTree = SOURCE_ROOT; }; - 7A899AB11A1A990C00B4EB56 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = ../OSX/OSX/OSX/en.lproj/MainMenu.xib; sourceTree = SOURCE_ROOT; }; - 7A899ACA1A1AB18C00B4EB56 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = ../OSX/OSX/OSX/en.lproj/Settings.xib; sourceTree = SOURCE_ROOT; }; + 7A868DD21AC85A8500B0EDDB /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = ../OSX/en.lproj/MainMenu.xib; sourceTree = SOURCE_ROOT; }; + 7A868DD41AC85A8500B0EDDB /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = ../OSX/en.lproj/Settings.xib; sourceTree = SOURCE_ROOT; }; 7AEFCD7C192128EA00FB5B6A /* utility.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = utility.m; path = ../common/utility.m; sourceTree = SOURCE_ROOT; }; 7AEFCD7E192128FE00FB5B6A /* RAGameView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RAGameView.m; path = ../common/RAGameView.m; sourceTree = SOURCE_ROOT; }; 7AEFCD821921292900FB5B6A /* platform.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = platform.m; path = ../OSX/platform.m; sourceTree = SOURCE_ROOT; }; @@ -147,8 +147,8 @@ 967894E7178A2E9B00D6CA69 /* Assets */ = { isa = PBXGroup; children = ( - 7A899AC91A1AB18C00B4EB56 /* Settings.xib */, - 7A899AB01A1A990C00B4EB56 /* MainMenu.xib */, + 7A868DD11AC85A8500B0EDDB /* MainMenu.xib */, + 7A868DD31AC85A8500B0EDDB /* Settings.xib */, 967894E8178A2EB400D6CA69 /* modules */, C15874EE178F2094001171D4 /* RetroArch.icns */, ); @@ -207,8 +207,8 @@ 967894931788ECDB00D6CA69 /* InfoPlist.strings in Resources */, 967894E9178A2EB400D6CA69 /* modules in Resources */, C15874EF178F2094001171D4 /* RetroArch.icns in Resources */, - 7A899AB21A1A990C00B4EB56 /* MainMenu.xib in Resources */, - 7A899ACB1A1AB18C00B4EB56 /* Settings.xib in Resources */, + 7A868DD51AC85A8500B0EDDB /* MainMenu.xib in Resources */, + 7A868DD61AC85A8500B0EDDB /* Settings.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -231,18 +231,18 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXVariantGroup section */ - 7A899AB01A1A990C00B4EB56 /* MainMenu.xib */ = { + 7A868DD11AC85A8500B0EDDB /* MainMenu.xib */ = { isa = PBXVariantGroup; children = ( - 7A899AB11A1A990C00B4EB56 /* en */, + 7A868DD21AC85A8500B0EDDB /* en */, ); name = MainMenu.xib; sourceTree = ""; }; - 7A899AC91A1AB18C00B4EB56 /* Settings.xib */ = { + 7A868DD31AC85A8500B0EDDB /* Settings.xib */ = { isa = PBXVariantGroup; children = ( - 7A899ACA1A1AB18C00B4EB56 /* en */, + 7A868DD41AC85A8500B0EDDB /* en */, ); name = Settings.xib; sourceTree = "";