archiveVersion = 1;
classes = {
};
- objectVersion = 42;
+ objectVersion = 45;
objects = {
/* Begin PBXAggregateTarget section */
- 630F6D6E1045DE4000B03EE4 /* core-framework */ = {
+ 630F6D6E1045DE4000B03EE4 /* Make VLC and VLCKit */ = {
isa = PBXAggregateTarget;
- buildConfigurationList = 630F6D801045DE6300B03EE4 /* Build configuration list for PBXAggregateTarget "core-framework" */;
+ buildConfigurationList = 630F6D801045DE6300B03EE4 /* Build configuration list for PBXAggregateTarget "Make VLC and VLCKit" */;
buildPhases = (
);
dependencies = (
630F6D721045DE4500B03EE4 /* PBXTargetDependency */,
630F6D741045DE4900B03EE4 /* PBXTargetDependency */,
);
- name = "core-framework";
+ name = "Make VLC and VLCKit";
productName = "core-framework";
};
- 633BD6D20D2ADE040012A314 /* vlc-contrib-core-framework */ = {
+ 633BD6D20D2ADE040012A314 /* Build Everything */ = {
isa = PBXAggregateTarget;
- buildConfigurationList = 633BD6D60D2ADE230012A314 /* Build configuration list for PBXAggregateTarget "vlc-contrib-core-framework" */;
+ buildConfigurationList = 633BD6D60D2ADE230012A314 /* Build configuration list for PBXAggregateTarget "Build Everything" */;
buildPhases = (
);
dependencies = (
633BD6F00D2AE0400012A314 /* PBXTargetDependency */,
633BD6F20D2AE0430012A314 /* PBXTargetDependency */,
);
- name = "vlc-contrib-core-framework";
+ name = "Build Everything";
productName = "vlc-core-modules";
};
- 633BD6E40D2ADF030012A314 /* vlc-contrib */ = {
+ 633BD6E40D2ADF030012A314 /* Setup VLC contribs */ = {
isa = PBXAggregateTarget;
- buildConfigurationList = 633BD6EC0D2ADF460012A314 /* Build configuration list for PBXAggregateTarget "vlc-contrib" */;
+ buildConfigurationList = 633BD6EC0D2ADF460012A314 /* Build configuration list for PBXAggregateTarget "Setup VLC contribs" */;
buildPhases = (
- 633BD6E30D2ADF030012A314 /* ShellScript */,
- 633BD6EB0D2ADF280012A314 /* ShellScript */,
+ 633BD6E30D2ADF030012A314 /* bootstrap */,
+ 633BD6EB0D2ADF280012A314 /* make bin */,
);
dependencies = (
);
- name = "vlc-contrib";
+ name = "Setup VLC contribs";
productName = "vlc-contrib";
};
- 63FFDBCE0D2AE2AE0092FC96 /* vlc-configure */ = {
+ 63FFDBCE0D2AE2AE0092FC96 /* Run VLC configure */ = {
isa = PBXAggregateTarget;
- buildConfigurationList = 63FFDBD50D2AE3250092FC96 /* Build configuration list for PBXAggregateTarget "vlc-configure" */;
+ buildConfigurationList = 63FFDBD50D2AE3250092FC96 /* Build configuration list for PBXAggregateTarget "Run VLC configure" */;
buildPhases = (
- 631A90420D5A007D0014A2CE /* ShellScript */,
- 63FFDBCD0D2AE2AE0092FC96 /* ShellScript */,
+ 631A90420D5A007D0014A2CE /* bootstrap */,
+ 63FFDBCD0D2AE2AE0092FC96 /* configure */,
);
dependencies = (
);
- name = "vlc-configure";
+ name = "Run VLC configure";
productName = "vlc-bootstrap";
};
/* End PBXAggregateTarget section */
/* End PBXHeadersBuildPhase section */
/* Begin PBXLegacyTarget section */
- 633BD6DB0D2ADE4E0012A314 /* vlc-core */ = {
+ 633BD6DB0D2ADE4E0012A314 /* Make VLC */ = {
isa = PBXLegacyTarget;
buildArgumentsString = "";
- buildConfigurationList = 633BD6DF0D2ADE6D0012A314 /* Build configuration list for PBXLegacyTarget "vlc-core" */;
+ buildConfigurationList = 633BD6DF0D2ADE6D0012A314 /* Build configuration list for PBXLegacyTarget "Make VLC" */;
buildPhases = (
);
buildToolPath = /usr/bin/make;
buildWorkingDirectory = "$(SYMROOT)/vlc_build_dir";
dependencies = (
);
- name = "vlc-core";
+ name = "Make VLC";
passBuildSettingsInEnvironment = 1;
productName = "vlc-core";
};
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "VLCKit" */;
- compatibilityVersion = "Xcode 2.4";
+ compatibilityVersion = "Xcode 3.1";
hasScannedForEncodings = 1;
mainGroup = 0867D691FE84028FC02AAC07 /* VLC */;
productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
projectDirPath = "";
projectRoot = "";
targets = (
- 633BD6D20D2ADE040012A314 /* vlc-contrib-core-framework */,
+ 633BD6D20D2ADE040012A314 /* Build Everything */,
8DC2EF4F0486A6940098B216 /* VLCKit */,
- 633BD6E40D2ADF030012A314 /* vlc-contrib */,
- 633BD6DB0D2ADE4E0012A314 /* vlc-core */,
- 63FFDBCE0D2AE2AE0092FC96 /* vlc-configure */,
- 630F6D6E1045DE4000B03EE4 /* core-framework */,
+ 633BD6E40D2ADF030012A314 /* Setup VLC contribs */,
+ 633BD6DB0D2ADE4E0012A314 /* Make VLC */,
+ 63FFDBCE0D2AE2AE0092FC96 /* Run VLC configure */,
+ 630F6D6E1045DE4000B03EE4 /* Make VLC and VLCKit */,
);
};
/* End PBXProject section */
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
- 631A90420D5A007D0014A2CE /* ShellScript */ = {
+ 631A90420D5A007D0014A2CE /* bootstrap */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
+ "$(SRCROOT)/../../../configure.ac",
"$(SRCROOT)/../../../bootstrap",
);
+ name = bootstrap;
outputPaths = (
"$(SRCROOT)/../../../configure",
);
shellScript = "top_srcdir=`pwd`/../../..\n\nif test $ACTION = \"clean\"\nthen\n exit 0\nfi\n\ncd $top_srcdir && ./bootstrap\n";
showEnvVarsInLog = 0;
};
- 633BD6E30D2ADF030012A314 /* ShellScript */ = {
+ 633BD6E30D2ADF030012A314 /* bootstrap */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
inputPaths = (
$SRCROOT/../../../extras/contrib/bootstrap,
);
+ name = bootstrap;
outputPaths = (
$SRCROOT/../../../extras/contrib/config.mak,
);
shellScript = "if test $ACTION = \"clean\"\nthen\n cd ../../../extras/contrib && make clean\n exit 0\nfi\nif test $ARCHS = \"x86_64\"\nthen\n cd ../../../extras/contrib && ./bootstrap x86_64-apple-darwin10\nelse\n cd ../../../extras/contrib && ./bootstrap\nfi";
showEnvVarsInLog = 0;
};
- 633BD6EB0D2ADF280012A314 /* ShellScript */ = {
+ 633BD6EB0D2ADF280012A314 /* make bin */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
+ name = "make bin";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if test \"$ACTION\" = \"clean\"; then\n exit 0\nfi\nif test \"$ARCHS\" = \"x86_64\"; then\n cd ../../../extras/contrib && make && ./bootstrap\nelse\n cd ../../../extras/contrib && make\nfi";
+ shellScript = "if test \"$ACTION\" = \"clean\"; then\n exit 0\nfi\ncd ../../../extras/contrib && make\n";
showEnvVarsInLog = 0;
};
- 63FFDBCD0D2AE2AE0092FC96 /* ShellScript */ = {
+ 63FFDBCD0D2AE2AE0092FC96 /* configure */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
+ name = configure;
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if test \"$ACTION\" = \"clean\"; then\n rm -Rf $SYMROOT/vlc_build_dir\n exit 0\nfi\n\ntop_srcdir=`pwd`/../../..\n\nif test \"$ARCHS\" = \"x86_64\"; then\n setenv CFLAGS -m64\n setenv CXXFLAGS -m64\n setenv CPPFLAGS -m64\n setenv OBJCFLAGS -m64\nfi\nif test \"$ARCHS\" = \"i386\"; then\n setenv CFLAGS -m32\n setenv CXXFLAGS -m32\n setenv CPPFLAGS -m32\n setenv OBJCFLAGS -m32\nfi\n\nmkdir -p $SYMROOT/vlc_build_dir\ncd $SYMROOT/vlc_build_dir && $top_srcdir/configure --disable-nls --enable-debug --with-macosx-sdk=$SDKROOT\n";
+ shellScript = "if test \"$ACTION\" = \"clean\"; then\n rm -Rf $SYMROOT/vlc_build_dir\n exit 0\nfi\n\ntop_srcdir=`pwd`/../../..\n\nmkdir -p $SYMROOT/vlc_build_dir\ncd $SYMROOT/vlc_build_dir\n\necho \"Building for $ARCHS with sdk=\\\"$SDKROOT\\\"\"\nargs=\"--disable-macosx\"\nargs=\"--enable-macosx-minimal\"\nargs=\"--enable-faad\"\nargs=\"--enable-flac $args\"\nargs=\"--enable-theora $args\"\nargs=\"--enable-shout $args\"\nargs=\"--enable-cddax $args\"\nargs=\"--enable-caca $args\"\nargs=\"--enable-vcdx $args\"\nargs=\"--disable-ncurses $args\"\nargs=\"--disable-httpd $args\"\nargs=\"--disable-vlm $args\"\nargs=\"--enable-twolame $args\"\nargs=\"--enable-realrtsp $args\"\nargs=\"--enable-libass $args\"\nargs=\"--enable-asademux $args\"\nargs=\"--disable-skins2 $args\"\nargs=\"--disable-x11 $args\"\nargs=\"--disable-glx $args\"\nargs=\"--disable-xvideo $args\"\nargs=\"--disable-xcb $args\"\nargs=\"--disable-sdl $args\"\nargs=\"--disable-sdl-image $args\"\nargs=\"--disable-visual $args\"\nargs=\"--with-macosx-version-min=10.5 $args\"\nif test \"x$SDKROOT\" != \"x\"\nthen\n\targs=\"--with-macosx-sdk=$SDKROOT $args\"\nfi\nargs=\"--enable-macosx $args\"\nif test \"$CONFIGURATION\" = \"Debug\"; then\nargs=\"--enable-debug $args\"\nelse\nargs=\"--enable-release $args\"\nfi\nargs=\"--disable-nls $args\"\nargs=\"--disable-macosx-defaults $args\"\nargs=\"--prefix=$SYMROOT/vlc_build_dir/vlc_install_dir $args\"\n\nif test $ARCHS = \"x86_64\"\nthen\n\targs=\"--build=x86_64-apple-darwin10 $args\"\nfi\n\necho \"Running configure $args\"\nCFLAGS=\"-arch $ARCHS\" CXXFLAGS=\"-arch $ARCHS\" CPPFLAGS=\"-arch $ARCHS\" OBJCFLAGS=\"-arch $ARCHS\" exec $top_srcdir/configure $args";
showEnvVarsInLog = 0;
};
EF78BD2E0CAEEF9500354E6E /* ShellScript */ = {
/* Begin PBXTargetDependency section */
630F6D721045DE4500B03EE4 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
- target = 633BD6DB0D2ADE4E0012A314 /* vlc-core */;
+ target = 633BD6DB0D2ADE4E0012A314 /* Make VLC */;
targetProxy = 630F6D711045DE4500B03EE4 /* PBXContainerItemProxy */;
};
630F6D741045DE4900B03EE4 /* PBXTargetDependency */ = {
};
633BD6EE0D2AE03E0012A314 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
- target = 633BD6E40D2ADF030012A314 /* vlc-contrib */;
+ target = 633BD6E40D2ADF030012A314 /* Setup VLC contribs */;
targetProxy = 633BD6ED0D2AE03E0012A314 /* PBXContainerItemProxy */;
};
633BD6F00D2AE0400012A314 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
- target = 633BD6DB0D2ADE4E0012A314 /* vlc-core */;
+ target = 633BD6DB0D2ADE4E0012A314 /* Make VLC */;
targetProxy = 633BD6EF0D2AE0400012A314 /* PBXContainerItemProxy */;
};
633BD6F20D2AE0430012A314 /* PBXTargetDependency */ = {
};
63FFDBD30D2AE3070092FC96 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
- target = 63FFDBCE0D2AE2AE0092FC96 /* vlc-configure */;
+ target = 63FFDBCE0D2AE2AE0092FC96 /* Run VLC configure */;
targetProxy = 63FFDBD20D2AE3070092FC96 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
PRIVATE_HEADERS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/PrivateHeaders";
PRODUCT_NAME = VLCKit;
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
- SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
+ SDKROOT = macosx10.5;
VLC_BUILD_DIR = "$(SYMROOT)/vlc_build_dir";
VLC_FRAMEWORK = "$(TARGET_BUILD_DIR)/$(PROJECT_NAME).framework";
VLC_SRC_DIR = ../../..;
WRAPPER_EXTENSION = framework;
- ZERO_LINK = YES;
};
name = Debug;
};
PRIVATE_HEADERS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/PrivateHeaders";
PRODUCT_NAME = VLCKit;
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
- SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
- VLC_BUILD_DIR = "$(VLC_SRC_DIR)";
+ SDKROOT = macosx10.5;
+ VLC_BUILD_DIR = "$(SYMROOT)/vlc_build_dir";
VLC_FRAMEWORK = "$(TARGET_BUILD_DIR)/$(PROJECT_NAME).framework";
VLC_SRC_DIR = ../../..;
WRAPPER_EXTENSION = framework;
1DEB91B208733DA50010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
- ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
- GCC_ENABLE_OBJC_GC = YES;
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+ GCC_ENABLE_OBJC_GC = supported;
GCC_VERSION = com.apple.compilers.llvmgcc42;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
+ ONLY_ACTIVE_ARCH = YES;
PREBINDING = NO;
- SDKROOT = "";
+ SDKROOT = macosx10.5;
};
name = Debug;
};
1DEB91B308733DA50010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
- ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
- GCC_ENABLE_OBJC_GC = YES;
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+ GCC_ENABLE_OBJC_GC = supported;
GCC_VERSION = com.apple.compilers.llvmgcc42;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
+ ONLY_ACTIVE_ARCH = YES;
PREBINDING = NO;
- SDKROOT = "";
+ SDKROOT = macosx10.5;
};
name = Release;
};
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
- 630F6D801045DE6300B03EE4 /* Build configuration list for PBXAggregateTarget "core-framework" */ = {
+ 630F6D801045DE6300B03EE4 /* Build configuration list for PBXAggregateTarget "Make VLC and VLCKit" */ = {
isa = XCConfigurationList;
buildConfigurations = (
630F6D6F1045DE4000B03EE4 /* Debug */,
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
- 633BD6D60D2ADE230012A314 /* Build configuration list for PBXAggregateTarget "vlc-contrib-core-framework" */ = {
+ 633BD6D60D2ADE230012A314 /* Build configuration list for PBXAggregateTarget "Build Everything" */ = {
isa = XCConfigurationList;
buildConfigurations = (
633BD6D40D2ADE050012A314 /* Debug */,
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
- 633BD6DF0D2ADE6D0012A314 /* Build configuration list for PBXLegacyTarget "vlc-core" */ = {
+ 633BD6DF0D2ADE6D0012A314 /* Build configuration list for PBXLegacyTarget "Make VLC" */ = {
isa = XCConfigurationList;
buildConfigurations = (
633BD6DD0D2ADE4F0012A314 /* Debug */,
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
- 633BD6EC0D2ADF460012A314 /* Build configuration list for PBXAggregateTarget "vlc-contrib" */ = {
+ 633BD6EC0D2ADF460012A314 /* Build configuration list for PBXAggregateTarget "Setup VLC contribs" */ = {
isa = XCConfigurationList;
buildConfigurations = (
633BD6E50D2ADF030012A314 /* Debug */,
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
- 63FFDBD50D2AE3250092FC96 /* Build configuration list for PBXAggregateTarget "vlc-configure" */ = {
+ 63FFDBD50D2AE3250092FC96 /* Build configuration list for PBXAggregateTarget "Run VLC configure" */ = {
isa = XCConfigurationList;
buildConfigurations = (
63FFDBD00D2AE2AE0092FC96 /* Debug */,
projects / vlc / blobdiff