From b6863dcc4a79cc237c11fb87bce1beeedfc466be Mon Sep 17 00:00:00 2001 From: miguelpinheiro Date: Mon, 13 Jul 2015 21:53:42 +0100 Subject: [PATCH 1/3] Updated xcode project and deleted legacy build steps Updated the xcode project to the recomended settings by the software and deleted steps in the build which no longer applied and caused the build to fail. --- apple/RetroArch.xcodeproj/project.pbxproj | 51 +++---------------- .../xcshareddata/RetroArch.xccheckout | 41 +++++++++++++++ 2 files changed, 49 insertions(+), 43 deletions(-) create mode 100644 apple/RetroArch.xcodeproj/project.xcworkspace/xcshareddata/RetroArch.xccheckout diff --git a/apple/RetroArch.xcodeproj/project.pbxproj b/apple/RetroArch.xcodeproj/project.pbxproj index 04e879f1ee..e7c7d45bb6 100644 --- a/apple/RetroArch.xcodeproj/project.pbxproj +++ b/apple/RetroArch.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 45; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ @@ -11,13 +11,6 @@ 5061C8A41AE47E510080AE14 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5061C8A31AE47E510080AE14 /* libz.dylib */; }; 509F0C9D1AA23AFC00619ECC /* griffin_objc.m in Sources */ = {isa = PBXBuildFile; fileRef = 509F0C9C1AA23AFC00619ECC /* griffin_objc.m */; }; 840222FC1A889EE2009AB261 /* griffin.c in Sources */ = {isa = PBXBuildFile; fileRef = 840222FB1A889EE2009AB261 /* griffin.c */; }; - 841CBB881A8A343E0066E9F1 /* rdb in CopyFiles */ = {isa = PBXBuildFile; fileRef = 841CBB7F1A8A31650066E9F1 /* rdb */; }; - 841CBB891A8A34420066E9F1 /* cursors in CopyFiles */ = {isa = PBXBuildFile; fileRef = 841CBB7D1A8A314F0066E9F1 /* cursors */; }; - 841CBB8A1A8A34470066E9F1 /* cht in CopyFiles */ = {isa = PBXBuildFile; fileRef = 841CBB7B1A8A31370066E9F1 /* cht */; }; - 841CBB8B1A8A347C0066E9F1 /* shaders_cg in CopyFiles */ = {isa = PBXBuildFile; fileRef = 841CBB791A8A311C0066E9F1 /* shaders_cg */; }; - 841CBB8C1A8A34810066E9F1 /* overlays in CopyFiles */ = {isa = PBXBuildFile; fileRef = 841CBB771A8A30F00066E9F1 /* overlays */; }; - 841CBB8D1A8A348B0066E9F1 /* autoconfig in CopyFiles */ = {isa = PBXBuildFile; fileRef = 841CBB751A8A30CC0066E9F1 /* autoconfig */; }; - 841CBB8E1A8A34920066E9F1 /* assets in CopyFiles */ = {isa = PBXBuildFile; fileRef = 841CBB731A8A308C0066E9F1 /* assets */; }; 84DD5E9F1A88E45B007336C1 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84DD5E9E1A88E45B007336C1 /* CoreVideo.framework */; }; 84DD5EA31A89E2AA007336C1 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29B97324FDCFA39411CA2CEA /* AppKit.framework */; }; 84DD5EA71A89E406007336C1 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84DD5EA61A89E406007336C1 /* CoreLocation.framework */; }; @@ -37,10 +30,6 @@ dstPath = ""; dstSubfolderSpec = 7; files = ( - 841CBB8E1A8A34920066E9F1 /* assets in CopyFiles */, - 841CBB8D1A8A348B0066E9F1 /* autoconfig in CopyFiles */, - 841CBB8C1A8A34810066E9F1 /* overlays in CopyFiles */, - 841CBB8B1A8A347C0066E9F1 /* shaders_cg in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -50,9 +39,6 @@ dstPath = ""; dstSubfolderSpec = 7; files = ( - 841CBB8A1A8A34470066E9F1 /* cht in CopyFiles */, - 841CBB891A8A34420066E9F1 /* cursors in CopyFiles */, - 841CBB881A8A343E0066E9F1 /* rdb in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -65,13 +51,6 @@ 5061C8A31AE47E510080AE14 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; 509F0C9C1AA23AFC00619ECC /* griffin_objc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = griffin_objc.m; path = ../griffin/griffin_objc.m; sourceTree = ""; }; 840222FB1A889EE2009AB261 /* griffin.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = griffin.c; path = ../griffin/griffin.c; sourceTree = SOURCE_ROOT; }; - 841CBB731A8A308C0066E9F1 /* assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = assets; path = ../media/assets; sourceTree = ""; }; - 841CBB751A8A30CC0066E9F1 /* autoconfig */ = {isa = PBXFileReference; lastKnownFileType = folder; name = autoconfig; path = ../media/autoconfig; sourceTree = ""; }; - 841CBB771A8A30F00066E9F1 /* overlays */ = {isa = PBXFileReference; lastKnownFileType = folder; name = overlays; path = ../media/overlays; sourceTree = ""; }; - 841CBB791A8A311C0066E9F1 /* shaders_cg */ = {isa = PBXFileReference; lastKnownFileType = folder; name = shaders_cg; path = ../media/shaders_cg; sourceTree = ""; }; - 841CBB7B1A8A31370066E9F1 /* cht */ = {isa = PBXFileReference; lastKnownFileType = folder; name = cht; path = ../media/libretrodb/cht; sourceTree = ""; }; - 841CBB7D1A8A314F0066E9F1 /* cursors */ = {isa = PBXFileReference; lastKnownFileType = folder; name = cursors; path = ../media/libretrodb/cursors; sourceTree = ""; }; - 841CBB7F1A8A31650066E9F1 /* rdb */ = {isa = PBXFileReference; lastKnownFileType = folder; name = rdb; path = ../media/libretrodb/rdb; sourceTree = ""; }; 84DD5E9E1A88E45B007336C1 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = /System/Library/Frameworks/CoreVideo.framework; sourceTree = ""; }; 84DD5EA61A89E406007336C1 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = /System/Library/Frameworks/CoreLocation.framework; sourceTree = ""; }; 84DD5EA81A89E4BE007336C1 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = /System/Library/Frameworks/CoreAudio.framework; sourceTree = ""; }; @@ -195,24 +174,9 @@ name = Core; sourceTree = ""; }; - 841CBB811A8A33640066E9F1 /* libretrodb */ = { - isa = PBXGroup; - children = ( - 841CBB7B1A8A31370066E9F1 /* cht */, - 841CBB7D1A8A314F0066E9F1 /* cursors */, - 841CBB7F1A8A31650066E9F1 /* rdb */, - ); - name = libretrodb; - sourceTree = ""; - }; 841CBB821A8A33810066E9F1 /* Assets */ = { isa = PBXGroup; children = ( - 841CBB731A8A308C0066E9F1 /* assets */, - 841CBB751A8A30CC0066E9F1 /* autoconfig */, - 841CBB771A8A30F00066E9F1 /* overlays */, - 841CBB791A8A311C0066E9F1 /* shaders_cg */, - 841CBB811A8A33640066E9F1 /* libretrodb */, ); name = Assets; sourceTree = ""; @@ -246,9 +210,10 @@ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; attributes = { + LastUpgradeCheck = 0640; }; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "RetroArch" */; - compatibilityVersion = "Xcode 3.1"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( @@ -312,6 +277,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -331,7 +297,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_CFLAGS = ( "-DHAVE_GRIFFIN", - "-DHAVE_IMAGEVIEWER", + "-DHAVE_IMAGEVIEWER", "-DHAVE_CORETEXT", "-DHAVE_IOHIDMANAGER", "-DHAVE_CORELOCATION", @@ -374,6 +340,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + COMBINE_HIDPI_IMAGES = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -391,7 +358,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_CFLAGS = ( "-DHAVE_GRIFFIN", - "-DHAVE_IMAGEVIEWER", + "-DHAVE_IMAGEVIEWER", "-DHAVE_IOHIDMANAGER", "-DHAVE_CORELOCATION", "-DHAVE_RGUI", @@ -432,13 +399,12 @@ C01FCF4F08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_OPTIMIZATION_LEVEL = 0; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; MACOSX_DEPLOYMENT_TARGET = 10.5; - ONLY_ACTIVE_ARCH = NO; + ONLY_ACTIVE_ARCH = YES; PREBINDING = NO; SDKROOT = macosx; }; @@ -447,7 +413,6 @@ C01FCF5008A954540054247B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; diff --git a/apple/RetroArch.xcodeproj/project.xcworkspace/xcshareddata/RetroArch.xccheckout b/apple/RetroArch.xcodeproj/project.xcworkspace/xcshareddata/RetroArch.xccheckout new file mode 100644 index 0000000000..e0148352f4 --- /dev/null +++ b/apple/RetroArch.xcodeproj/project.xcworkspace/xcshareddata/RetroArch.xccheckout @@ -0,0 +1,41 @@ + + + + + IDESourceControlProjectFavoriteDictionaryKey + + IDESourceControlProjectIdentifier + 8DFA4BD3-99D5-4B35-9A2F-50DD6A91AFE2 + IDESourceControlProjectName + RetroArch + IDESourceControlProjectOriginsDictionary + + C7C12374C7051F8843B3EFA1ACCAF2907102CCF7 + https://github.com/miguelpinheiro/RetroArch.git + + IDESourceControlProjectPath + apple/RetroArch.xcodeproj + IDESourceControlProjectRelativeInstallPathDictionary + + C7C12374C7051F8843B3EFA1ACCAF2907102CCF7 + ../../.. + + IDESourceControlProjectURL + https://github.com/miguelpinheiro/RetroArch.git + IDESourceControlProjectVersion + 111 + IDESourceControlProjectWCCIdentifier + C7C12374C7051F8843B3EFA1ACCAF2907102CCF7 + IDESourceControlProjectWCConfigurations + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + C7C12374C7051F8843B3EFA1ACCAF2907102CCF7 + IDESourceControlWCCName + RetroArch + + + + From 413c2bc35fa6b5133e871fcf4da02b3884042d06 Mon Sep 17 00:00:00 2001 From: miguelpinheiro Date: Mon, 13 Jul 2015 22:20:39 +0100 Subject: [PATCH 2/3] Delete RetroArch.xccheckout --- .../xcshareddata/RetroArch.xccheckout | 41 ------------------- 1 file changed, 41 deletions(-) delete mode 100644 apple/RetroArch.xcodeproj/project.xcworkspace/xcshareddata/RetroArch.xccheckout diff --git a/apple/RetroArch.xcodeproj/project.xcworkspace/xcshareddata/RetroArch.xccheckout b/apple/RetroArch.xcodeproj/project.xcworkspace/xcshareddata/RetroArch.xccheckout deleted file mode 100644 index e0148352f4..0000000000 --- a/apple/RetroArch.xcodeproj/project.xcworkspace/xcshareddata/RetroArch.xccheckout +++ /dev/null @@ -1,41 +0,0 @@ - - - - - IDESourceControlProjectFavoriteDictionaryKey - - IDESourceControlProjectIdentifier - 8DFA4BD3-99D5-4B35-9A2F-50DD6A91AFE2 - IDESourceControlProjectName - RetroArch - IDESourceControlProjectOriginsDictionary - - C7C12374C7051F8843B3EFA1ACCAF2907102CCF7 - https://github.com/miguelpinheiro/RetroArch.git - - IDESourceControlProjectPath - apple/RetroArch.xcodeproj - IDESourceControlProjectRelativeInstallPathDictionary - - C7C12374C7051F8843B3EFA1ACCAF2907102CCF7 - ../../.. - - IDESourceControlProjectURL - https://github.com/miguelpinheiro/RetroArch.git - IDESourceControlProjectVersion - 111 - IDESourceControlProjectWCCIdentifier - C7C12374C7051F8843B3EFA1ACCAF2907102CCF7 - IDESourceControlProjectWCConfigurations - - - IDESourceControlRepositoryExtensionIdentifierKey - public.vcs.git - IDESourceControlWCCIdentifierKey - C7C12374C7051F8843B3EFA1ACCAF2907102CCF7 - IDESourceControlWCCName - RetroArch - - - - From fd1e5562922629042103395010f6210307feba10 Mon Sep 17 00:00:00 2001 From: miguelpinheiro Date: Mon, 13 Jul 2015 22:28:25 +0100 Subject: [PATCH 3/3] Update project.pbxproj --- apple/RetroArch.xcodeproj/project.pbxproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apple/RetroArch.xcodeproj/project.pbxproj b/apple/RetroArch.xcodeproj/project.pbxproj index e7c7d45bb6..ab5ee58c82 100644 --- a/apple/RetroArch.xcodeproj/project.pbxproj +++ b/apple/RetroArch.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 45; objects = { /* Begin PBXBuildFile section */ @@ -213,7 +213,7 @@ LastUpgradeCheck = 0640; }; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "RetroArch" */; - compatibilityVersion = "Xcode 3.2"; + compatibilityVersion = "Xcode 3.1"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( @@ -404,7 +404,7 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; MACOSX_DEPLOYMENT_TARGET = 10.5; - ONLY_ACTIVE_ARCH = YES; + ONLY_ACTIVE_ARCH = NO; PREBINDING = NO; SDKROOT = macosx; };