From 5853062402aafa29181d24d1c2e5f278a6d7596e Mon Sep 17 00:00:00 2001 From: Elvis Dowson Date: Fri, 2 Jan 2015 14:45:36 +0400 Subject: [PATCH] C/xpcExample: Update XCode project to reference new source file location. This commit: - updates the XCode project to 6.1.1 - updates the reference to the xpcExample source file - modifies the project so that some of the files that are copied across during the build phase are only done during deployment. Signed-off-by: Elvis Dowson --- .../xpcExample.xcodeproj/project.pbxproj | 10 ++++------ .../xcshareddata/xpcExample.xccheckout | 18 +++++++++--------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/C/xpcExample/xpcExample.xcodeproj/project.pbxproj b/C/xpcExample/xpcExample.xcodeproj/project.pbxproj index 3028f4e..21f3aec 100644 --- a/C/xpcExample/xpcExample.xcodeproj/project.pbxproj +++ b/C/xpcExample/xpcExample.xcodeproj/project.pbxproj @@ -16,14 +16,14 @@ /* Begin PBXCopyFilesBuildPhase section */ BE60308318E5F7A5004B5E1D /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; - buildActionMask = 12; + buildActionMask = 8; dstPath = /Users/cteubert/Documents/flightdeckz/connections/src/xplaneconnect; dstSubfolderSpec = 0; files = ( BEDC620818EDF254005DB364 /* xplaneConnect.c in CopyFiles */, BEDC620918EDF257005DB364 /* xplaneConnect.h in CopyFiles */, ); - runOnlyForDeploymentPostprocessing = 0; + runOnlyForDeploymentPostprocessing = 1; }; /* End PBXCopyFilesBuildPhase section */ @@ -31,7 +31,7 @@ BEDC61FF18EDF0F5005DB364 /* xplaneConnect.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = xplaneConnect.c; path = ../src/xplaneConnect.c; sourceTree = ""; }; BEDC620018EDF0F5005DB364 /* xplaneConnect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = xplaneConnect.h; path = ../src/xplaneConnect.h; sourceTree = ""; }; BEF9890B18E4E7F7005554D1 /* xpcExample */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = xpcExample; sourceTree = BUILT_PRODUCTS_DIR; }; - BEF9890E18E4E7F7005554D1 /* main.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = ""; }; + BEF9890E18E4E7F7005554D1 /* main.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = src/main.cpp; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -105,7 +105,7 @@ BEF9890318E4E7F7005554D1 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0500; + LastUpgradeCheck = 0610; ORGANIZATIONNAME = "Chris Teubert"; }; buildConfigurationList = BEF9890618E4E7F7005554D1 /* Build configuration list for PBXProject "xpcExample" */; @@ -209,7 +209,6 @@ BEF9891518E4E7F7005554D1 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, @@ -222,7 +221,6 @@ BEF9891618E4E7F7005554D1 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, diff --git a/C/xpcExample/xpcExample.xcodeproj/project.xcworkspace/xcshareddata/xpcExample.xccheckout b/C/xpcExample/xpcExample.xcodeproj/project.xcworkspace/xcshareddata/xpcExample.xccheckout index 94d88f7..b474632 100644 --- a/C/xpcExample/xpcExample.xcodeproj/project.xcworkspace/xcshareddata/xpcExample.xccheckout +++ b/C/xpcExample/xpcExample.xcodeproj/project.xcworkspace/xcshareddata/xpcExample.xccheckout @@ -10,31 +10,31 @@ xpcExample IDESourceControlProjectOriginsDictionary - C03F0B00-9A73-4E8C-88E5-1BC53A92AE34 - https://github.com/nasa/XPlaneConnect.git + 975A665F236BF35140EC3819BE16448F522675A6 + ssh://ares:8420/aerospace/simulation/xplane/xplane_connect IDESourceControlProjectPath - C/xpcExample/xpcExample.xcodeproj/project.xcworkspace + C/xpcExample/xpcExample.xcodeproj IDESourceControlProjectRelativeInstallPathDictionary - C03F0B00-9A73-4E8C-88E5-1BC53A92AE34 + 975A665F236BF35140EC3819BE16448F522675A6 ../../../.. IDESourceControlProjectURL - https://github.com/nasa/XPlaneConnect.git + ssh://ares:8420/aerospace/simulation/xplane/xplane_connect IDESourceControlProjectVersion - 110 + 111 IDESourceControlProjectWCCIdentifier - C03F0B00-9A73-4E8C-88E5-1BC53A92AE34 + 975A665F236BF35140EC3819BE16448F522675A6 IDESourceControlProjectWCConfigurations IDESourceControlRepositoryExtensionIdentifierKey public.vcs.git IDESourceControlWCCIdentifierKey - C03F0B00-9A73-4E8C-88E5-1BC53A92AE34 + 975A665F236BF35140EC3819BE16448F522675A6 IDESourceControlWCCName - XPlaneConnect + xplane_connect