Commit 863c6af1 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont

macosx/framework: Now that target "Build Everything" doesn't rebuild contrib...

macosx/framework: Now that target "Build Everything" doesn't rebuild contrib and configure for fun, remove "Make VLC and VLCKit" target.
parent 948ccf4a
...@@ -7,18 +7,6 @@ ...@@ -7,18 +7,6 @@
objects = { objects = {
/* Begin PBXAggregateTarget section */ /* Begin PBXAggregateTarget section */
630F6D6E1045DE4000B03EE4 /* Make VLC and VLCKit */ = {
isa = PBXAggregateTarget;
buildConfigurationList = 630F6D801045DE6300B03EE4 /* Build configuration list for PBXAggregateTarget "Make VLC and VLCKit" */;
buildPhases = (
);
dependencies = (
633754B110ED0BB50072A0D9 /* PBXTargetDependency */,
630F6D741045DE4900B03EE4 /* PBXTargetDependency */,
);
name = "Make VLC and VLCKit";
productName = "core-framework";
};
6337547910ED090A0072A0D9 /* Make VLC */ = { 6337547910ED090A0072A0D9 /* Make VLC */ = {
isa = PBXAggregateTarget; isa = PBXAggregateTarget;
buildConfigurationList = 6337548110ED093B0072A0D9 /* Build configuration list for PBXAggregateTarget "Make VLC" */; buildConfigurationList = 6337548110ED093B0072A0D9 /* Build configuration list for PBXAggregateTarget "Make VLC" */;
...@@ -39,6 +27,7 @@ ...@@ -39,6 +27,7 @@
dependencies = ( dependencies = (
633BD6EE0D2AE03E0012A314 /* PBXTargetDependency */, 633BD6EE0D2AE03E0012A314 /* PBXTargetDependency */,
63FFDBD30D2AE3070092FC96 /* PBXTargetDependency */, 63FFDBD30D2AE3070092FC96 /* PBXTargetDependency */,
633754FA10ED103B0072A0D9 /* PBXTargetDependency */,
633BD6F20D2AE0430012A314 /* PBXTargetDependency */, 633BD6F20D2AE0430012A314 /* PBXTargetDependency */,
); );
name = "Build Everything"; name = "Build Everything";
...@@ -110,19 +99,12 @@ ...@@ -110,19 +99,12 @@
/* End PBXBuildFile section */ /* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */ /* Begin PBXContainerItemProxy section */
630F6D731045DE4900B03EE4 /* PBXContainerItemProxy */ = { 633754F910ED103B0072A0D9 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy; isa = PBXContainerItemProxy;
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
proxyType = 1; proxyType = 1;
remoteGlobalIDString = 8DC2EF4F0486A6940098B216; remoteGlobalIDString = 6337547910ED090A0072A0D9 /* Make VLC */;
remoteInfo = VLCKit; remoteInfo = "Make VLC";
};
633754B010ED0BB50072A0D9 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 6337547910ED090A0072A0D9 /* Make VLC 2 */;
remoteInfo = "Make VLC 2";
}; };
633BD6ED0D2AE03E0012A314 /* PBXContainerItemProxy */ = { 633BD6ED0D2AE03E0012A314 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy; isa = PBXContainerItemProxy;
...@@ -428,11 +410,10 @@ ...@@ -428,11 +410,10 @@
projectRoot = ""; projectRoot = "";
targets = ( targets = (
633BD6D20D2ADE040012A314 /* Build Everything */, 633BD6D20D2ADE040012A314 /* Build Everything */,
8DC2EF4F0486A6940098B216 /* VLCKit */,
633BD6E40D2ADF030012A314 /* Setup VLC contribs */, 633BD6E40D2ADF030012A314 /* Setup VLC contribs */,
63FFDBCE0D2AE2AE0092FC96 /* Run VLC configure */, 63FFDBCE0D2AE2AE0092FC96 /* Run VLC configure */,
6337547910ED090A0072A0D9 /* Make VLC */, 6337547910ED090A0072A0D9 /* Make VLC */,
630F6D6E1045DE4000B03EE4 /* Make VLC and VLCKit */, 8DC2EF4F0486A6940098B216 /* VLCKit */,
); );
}; };
/* End PBXProject section */ /* End PBXProject section */
...@@ -538,9 +519,11 @@ ...@@ -538,9 +519,11 @@
files = ( files = (
); );
inputPaths = ( inputPaths = (
"$(SRCROOT)/../../../configure",
); );
name = configure; name = configure;
outputPaths = ( outputPaths = (
"$(SYMROOT)/vlc_build_dir/Makefile",
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh; shellPath = /bin/sh;
...@@ -589,15 +572,10 @@ ...@@ -589,15 +572,10 @@
/* End PBXSourcesBuildPhase section */ /* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */ /* Begin PBXTargetDependency section */
630F6D741045DE4900B03EE4 /* PBXTargetDependency */ = { 633754FA10ED103B0072A0D9 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 8DC2EF4F0486A6940098B216 /* VLCKit */;
targetProxy = 630F6D731045DE4900B03EE4 /* PBXContainerItemProxy */;
};
633754B110ED0BB50072A0D9 /* PBXTargetDependency */ = {
isa = PBXTargetDependency; isa = PBXTargetDependency;
target = 6337547910ED090A0072A0D9 /* Make VLC */; target = 6337547910ED090A0072A0D9 /* Make VLC */;
targetProxy = 633754B010ED0BB50072A0D9 /* PBXContainerItemProxy */; targetProxy = 633754F910ED103B0072A0D9 /* PBXContainerItemProxy */;
}; };
633BD6EE0D2AE03E0012A314 /* PBXTargetDependency */ = { 633BD6EE0D2AE03E0012A314 /* PBXTargetDependency */ = {
isa = PBXTargetDependency; isa = PBXTargetDependency;
...@@ -731,30 +709,24 @@ ...@@ -731,30 +709,24 @@
}; };
name = Release; name = Release;
}; };
630F6D6F1045DE4000B03EE4 /* Debug */ = { 6337547C10ED090B0072A0D9 /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CC = "/Developer/usr/bin/llvm-gcc-4.2";
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
CXX = "/Developer/usr/bin/llvm-g++-4.2";
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_OBJC_GC = supported;
GCC_OPTIMIZATION_LEVEL = 0; GCC_OPTIMIZATION_LEVEL = 0;
PRODUCT_NAME = "core-framework"; GCC_VERSION = 4.2;
}; GCC_WARN_ABOUT_RETURN_TYPE = YES;
name = Debug; GCC_WARN_UNUSED_VARIABLE = YES;
}; OBJC = "/Developer/usr/bin/llvm-gcc-4.2";
630F6D701045DE4000B03EE4 /* Release */ = { ONLY_ACTIVE_ARCH = YES;
isa = XCBuildConfiguration; PREBINDING = NO;
buildSettings = { PRODUCT_NAME = "vlc-make";
COPY_PHASE_STRIP = YES; SDKROOT = macosx10.5;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_ENABLE_FIX_AND_CONTINUE = NO;
PRODUCT_NAME = "core-framework";
ZERO_LINK = NO;
};
name = Release;
};
6337547C10ED090B0072A0D9 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
}; };
name = Debug; name = Debug;
}; };
...@@ -861,15 +833,6 @@ ...@@ -861,15 +833,6 @@
defaultConfigurationIsVisible = 0; defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug; defaultConfigurationName = Debug;
}; };
630F6D801045DE6300B03EE4 /* Build configuration list for PBXAggregateTarget "Make VLC and VLCKit" */ = {
isa = XCConfigurationList;
buildConfigurations = (
630F6D6F1045DE4000B03EE4 /* Debug */,
630F6D701045DE4000B03EE4 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
6337548110ED093B0072A0D9 /* Build configuration list for PBXAggregateTarget "Make VLC" */ = { 6337548110ED093B0072A0D9 /* Build configuration list for PBXAggregateTarget "Make VLC" */ = {
isa = XCConfigurationList; isa = XCConfigurationList;
buildConfigurations = ( buildConfigurations = (
......
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