Commit a93f939b authored by Eloy Duran's avatar Eloy Duran

Remove existing target from osx template and generate it programmatically as well.

parent f831dc85
......@@ -332,9 +332,9 @@ module Pod
'GCC_PRECOMPILE_PREFIX_HEADER' => 'YES',
'GCC_PREFIX_HEADER' => 'Pods-Prefix.pch',
'GCC_VERSION' => 'com.apple.compilers.llvm.clang.1_0',
# TODO not sure if this specific flag is needed, but the OTHER_LDFLAGS option *has* to
# be overriden so that it does not use those from the xcconfig (for CocoaPods specific).
'OTHER_LDFLAGS' => '-ObjC',
# The OTHER_LDFLAGS option *has* to be overriden so that it does not
# use those from the xcconfig (for CocoaPods specifically).
'OTHER_LDFLAGS' => '',
'PRODUCT_NAME' => '$(TARGET_NAME)',
'SKIP_INSTALL' => 'YES',
}.merge(buildSettings || {})
......
......@@ -184,7 +184,7 @@ describe "Pod::Xcode::Project" do
'DSTROOT' => '/tmp/Pods.dst',
'GCC_PRECOMPILE_PREFIX_HEADER' => 'YES',
'GCC_PREFIX_HEADER' => 'Pods-Prefix.pch',
'OTHER_LDFLAGS' => '-ObjC',
'OTHER_LDFLAGS' => '',
'GCC_VERSION' => 'com.apple.compilers.llvm.clang.1_0',
'PRODUCT_NAME' => '$(TARGET_NAME)',
'SKIP_INSTALL' => 'YES',
......
......@@ -6,28 +6,12 @@
objectVersion = 46;
objects = {
/* Begin PBXBuildFile section */
518ACD3F1446050200F6BE80 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 518ACD3E1446050200F6BE80 /* Cocoa.framework */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
518ACD3B1446050200F6BE80 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
518ACD3E1446050200F6BE80 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
518ACD461446050200F6BE80 /* Pods-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Pods-Prefix.pch"; sourceTree = "<group>"; };
518ACD53144605B400F6BE80 /* Pods.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Pods.xcconfig; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
518ACD381446050200F6BE80 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
518ACD3F1446050200F6BE80 /* Cocoa.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
518ACD301446050100F6BE80 = {
isa = PBXGroup;
......@@ -42,7 +26,6 @@
518ACD3C1446050200F6BE80 /* Products */ = {
isa = PBXGroup;
children = (
518ACD3B1446050200F6BE80 /* libPods.a */,
);
name = Products;
sourceTree = "<group>";
......@@ -74,36 +57,6 @@
};
/* End PBXGroup section */
/* Begin PBXHeadersBuildPhase section */
518ACD391446050200F6BE80 /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXHeadersBuildPhase section */
/* Begin PBXNativeTarget section */
518ACD3A1446050200F6BE80 /* Pods */ = {
isa = PBXNativeTarget;
buildConfigurationList = 518ACD4C1446050200F6BE80 /* Build configuration list for PBXNativeTarget "Pods" */;
buildPhases = (
518ACD371446050200F6BE80 /* Sources */,
518ACD381446050200F6BE80 /* Frameworks */,
518ACD391446050200F6BE80 /* Headers */,
);
buildRules = (
);
dependencies = (
);
name = Pods;
productName = Pods;
productReference = 518ACD3B1446050200F6BE80 /* libPods.a */;
productType = "com.apple.product-type.library.static";
};
/* End PBXNativeTarget section */
/* Begin PBXProject section */
518ACD321446050100F6BE80 /* Project object */ = {
isa = PBXProject;
......@@ -122,21 +75,10 @@
projectDirPath = "";
projectRoot = "";
targets = (
518ACD3A1446050200F6BE80 /* Pods */,
);
};
/* End PBXProject section */
/* Begin PBXSourcesBuildPhase section */
518ACD371446050200F6BE80 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */
/* Begin XCBuildConfiguration section */
518ACD4A1446050200F6BE80 /* Debug */ = {
isa = XCBuildConfiguration;
......@@ -185,30 +127,6 @@
};
name = Release;
};
518ACD4D1446050200F6BE80 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 518ACD53144605B400F6BE80 /* Pods.xcconfig */;
buildSettings = {
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "Pods-Prefix.pch";
OTHER_LDFLAGS = (
);
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
};
518ACD4E1446050200F6BE80 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 518ACD53144605B400F6BE80 /* Pods.xcconfig */;
buildSettings = {
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "Pods-Prefix.pch";
OTHER_LDFLAGS = (
);
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
};
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
......@@ -221,15 +139,6 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
518ACD4C1446050200F6BE80 /* Build configuration list for PBXNativeTarget "Pods" */ = {
isa = XCConfigurationList;
buildConfigurations = (
518ACD4D1446050200F6BE80 /* Debug */,
518ACD4E1446050200F6BE80 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
rootObject = 518ACD321446050100F6BE80 /* Project object */;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment