Skip to content

V
vlc-2-2
Commit 124f1fe6 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont
Browse files
Options

MacOSX/VLC_app/VLC.xcodeproj: Create three different targets to have more... 

MacOSX/VLC_app/VLC.xcodeproj: Create three different targets to have more grain control over the dependencies. And fix the framework installation script. Default the use of the vlc-contrib-core-framework-app Target.
parent 361d1636
Show whitespace changes
Inline Side-by-side
Showing with 72 additions and 18 deletions
extras/MacOSX/VLC_app/VLC.xcodeproj/project.pbxproj
View file @ 124f1fe6
...@@ -14,11 +14,23 @@ ...@@ -14,11 +14,23 @@
); );
dependencies = ( dependencies = (
633BD7110D2AE0E50012A314 /* PBXTargetDependency */, 633BD7110D2AE0E50012A314 /* PBXTargetDependency */,
633BD7130D2AE0EB0012A314 /* PBXTargetDependency */, 637F33EB0D2AEE4B001E70AB /* PBXTargetDependency */,
); );
name = "vlc-contrib-core-framework-app"; name = "vlc-contrib-core-framework-app";
productName = "vlc-contrib-core-framework-app"; productName = "vlc-contrib-core-framework-app";
}; };
637F33DF0D2AEE05001E70AB /* vlc-framework-app */ = {
isa = PBXAggregateTarget;
buildConfigurationList = 637F33F80D2AEE67001E70AB /* Build configuration list for PBXAggregateTarget "vlc-framework-app" */;
buildPhases = (
);
dependencies = (
637F33E50D2AEE29001E70AB /* PBXTargetDependency */,
637F33E90D2AEE48001E70AB /* PBXTargetDependency */,
);
name = "vlc-framework-app";
productName = "vlc-framework-app";
};
/* End PBXAggregateTarget section */ /* End PBXAggregateTarget section */
/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
...@@ -60,27 +72,34 @@ ...@@ -60,27 +72,34 @@
remoteGlobalIDString = 8DC2EF5B0486A6940098B216; remoteGlobalIDString = 8DC2EF5B0486A6940098B216;
remoteInfo = VLC; remoteInfo = VLC;
}; };
633BD6C30D2ADBBC0012A314 /* PBXContainerItemProxy */ = { 633BD7100D2AE0E50012A314 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy; isa = PBXContainerItemProxy;
containerPortal = 633BD69D0D2ACE520012A314 /* VLC.xcodeproj */; containerPortal = 633BD69D0D2ACE520012A314 /* VLC.xcodeproj */;
proxyType = 1; proxyType = 1;
remoteGlobalIDString = 8DC2EF4F0486A6940098B216; remoteGlobalIDString = 633BD6D20D2ADE040012A314;
remoteInfo = VLC; remoteInfo = "vlc-contrib-core-framework";
}; };
633BD7100D2AE0E50012A314 /* PBXContainerItemProxy */ = { 637F33E40D2AEE29001E70AB /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy; isa = PBXContainerItemProxy;
containerPortal = 633BD69D0D2ACE520012A314 /* VLC.xcodeproj */; containerPortal = 633BD69D0D2ACE520012A314 /* VLC.xcodeproj */;
proxyType = 1; proxyType = 1;
remoteGlobalIDString = 633BD6D20D2ADE040012A314; remoteGlobalIDString = 8DC2EF4F0486A6940098B216 /* VLC */;
remoteInfo = "vlc-contrib-core-framework"; remoteInfo = VLC;
}; };
633BD7120D2AE0EB0012A314 /* PBXContainerItemProxy */ = { 637F33E80D2AEE48001E70AB /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy; isa = PBXContainerItemProxy;
containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
proxyType = 1; proxyType = 1;
remoteGlobalIDString = 8D1107260486CEB800E47090; remoteGlobalIDString = 8D1107260486CEB800E47090 /* VLC */;
remoteInfo = VLC; remoteInfo = VLC;
}; };
637F33EA0D2AEE4B001E70AB /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
proxyType = 1;
remoteGlobalIDString = 637F33DF0D2AEE05001E70AB /* vlc-framework-app */;
remoteInfo = "vlc-framework-app";
};
/* End PBXContainerItemProxy section */ /* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
...@@ -329,7 +348,6 @@ ...@@ -329,7 +348,6 @@
buildRules = ( buildRules = (
); );
dependencies = ( dependencies = (
633BD6C40D2ADBBC0012A314 /* PBXTargetDependency */,
); );
name = VLC; name = VLC;
productInstallPath = "$(HOME)/Applications"; productInstallPath = "$(HOME)/Applications";
...@@ -356,6 +374,7 @@ ...@@ -356,6 +374,7 @@
projectRoot = ""; projectRoot = "";
targets = ( targets = (
633BD70D0D2AE0DF0012A314 /* vlc-contrib-core-framework-app */, 633BD70D0D2AE0DF0012A314 /* vlc-contrib-core-framework-app */,
637F33DF0D2AEE05001E70AB /* vlc-framework-app */,
8D1107260486CEB800E47090 /* VLC */, 8D1107260486CEB800E47090 /* VLC */,
); );
}; };
...@@ -409,7 +428,7 @@ ...@@ -409,7 +428,7 @@
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh; shellPath = /bin/sh;
shellScript = "/Developer/Library/PrivateFrameworks/DevToolsCore.framework/Resources/pbxcp -exclude .DS_Store -exclude CVS -exclude .svn -resolve-src-symlinks $SRCROOT/../Framework/build/$BUILD_VARIANTS/VLC.framework $BUILT_PRODUCTS_DIR/$PRODUCT_NAME.app/Contents/Frameworks"; shellScript = "/Developer/Library/PrivateFrameworks/DevToolsCore.framework/Resources/pbxcp -exclude .DS_Store -exclude CVS -exclude .svn -resolve-src-symlinks $SRCROOT/../Framework/build/$CONFIGURATION/VLC.framework $BUILT_PRODUCTS_DIR/$PRODUCT_NAME.app/Contents/Frameworks";
showEnvVarsInLog = 0; showEnvVarsInLog = 0;
}; };
/* End PBXShellScriptBuildPhase section */ /* End PBXShellScriptBuildPhase section */
...@@ -435,20 +454,25 @@ ...@@ -435,20 +454,25 @@
/* End PBXSourcesBuildPhase section */ /* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */ /* Begin PBXTargetDependency section */
633BD6C40D2ADBBC0012A314 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = VLC;
targetProxy = 633BD6C30D2ADBBC0012A314 /* PBXContainerItemProxy */;
};
633BD7110D2AE0E50012A314 /* PBXTargetDependency */ = { 633BD7110D2AE0E50012A314 /* PBXTargetDependency */ = {
isa = PBXTargetDependency; isa = PBXTargetDependency;
name = "vlc-contrib-core-framework"; name = "vlc-contrib-core-framework";
targetProxy = 633BD7100D2AE0E50012A314 /* PBXContainerItemProxy */; targetProxy = 633BD7100D2AE0E50012A314 /* PBXContainerItemProxy */;
}; };
633BD7130D2AE0EB0012A314 /* PBXTargetDependency */ = { 637F33E50D2AEE29001E70AB /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = VLC;
targetProxy = 637F33E40D2AEE29001E70AB /* PBXContainerItemProxy */;
};
637F33E90D2AEE48001E70AB /* PBXTargetDependency */ = {
isa = PBXTargetDependency; isa = PBXTargetDependency;
target = 8D1107260486CEB800E47090 /* VLC */; target = 8D1107260486CEB800E47090 /* VLC */;
targetProxy = 633BD7120D2AE0EB0012A314 /* PBXContainerItemProxy */; targetProxy = 637F33E80D2AEE48001E70AB /* PBXContainerItemProxy */;
};
637F33EB0D2AEE4B001E70AB /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 637F33DF0D2AEE05001E70AB /* vlc-framework-app */;
targetProxy = 637F33EA0D2AEE4B001E70AB /* PBXContainerItemProxy */;
}; };
/* End PBXTargetDependency section */ /* End PBXTargetDependency section */
...@@ -501,6 +525,27 @@ ...@@ -501,6 +525,27 @@
}; };
name = Release; name = Release;
}; };
637F33E00D2AEE05001E70AB /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
PRODUCT_NAME = "vlc-framework-app";
};
name = Debug;
};
637F33E10D2AEE05001E70AB /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_ENABLE_FIX_AND_CONTINUE = NO;
PRODUCT_NAME = "vlc-framework-app";
ZERO_LINK = NO;
};
name = Release;
};
C01FCF4B08A954540054247B /* Debug */ = { C01FCF4B08A954540054247B /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
...@@ -578,6 +623,15 @@ ...@@ -578,6 +623,15 @@
defaultConfigurationIsVisible = 0; defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release; defaultConfigurationName = Release;
}; };
637F33F80D2AEE67001E70AB /* Build configuration list for PBXAggregateTarget "vlc-framework-app" */ = {
isa = XCConfigurationList;
buildConfigurations = (
637F33E00D2AEE05001E70AB /* Debug */,
637F33E10D2AEE05001E70AB /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "VLC" */ = { C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "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