X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=projects%2Fmacosx%2Fframework%2FVLCKit.xcodeproj%2Fproject.pbxproj;h=fafdbbb321d5acbbf8e146e92979aa36ae7b71aa;hb=17df4f91487f3a6a1a4d36e0156cca5d074a7bb7;hp=f6c726a637b9c392baba371804e0115dce3db9e6;hpb=93442c633e030ed20cc215059de1d4f7fab5a3f3;p=vlc diff --git a/projects/macosx/framework/VLCKit.xcodeproj/project.pbxproj b/projects/macosx/framework/VLCKit.xcodeproj/project.pbxproj index f6c726a637..fafdbbb321 100644 --- a/projects/macosx/framework/VLCKit.xcodeproj/project.pbxproj +++ b/projects/macosx/framework/VLCKit.xcodeproj/project.pbxproj @@ -3,13 +3,25 @@ archiveVersion = 1; classes = { }; - objectVersion = 42; + objectVersion = 45; objects = { /* Begin PBXAggregateTarget section */ - 633BD6D20D2ADE040012A314 /* vlc-contrib-core-framework */ = { + 630F6D6E1045DE4000B03EE4 /* Make VLC and VLCKit */ = { isa = PBXAggregateTarget; - buildConfigurationList = 633BD6D60D2ADE230012A314 /* Build configuration list for PBXAggregateTarget "vlc-contrib-core-framework" */; + buildConfigurationList = 630F6D801045DE6300B03EE4 /* Build configuration list for PBXAggregateTarget "Make VLC and VLCKit" */; + buildPhases = ( + ); + dependencies = ( + 630F6D721045DE4500B03EE4 /* PBXTargetDependency */, + 630F6D741045DE4900B03EE4 /* PBXTargetDependency */, + ); + name = "Make VLC and VLCKit"; + productName = "core-framework"; + }; + 633BD6D20D2ADE040012A314 /* Build Everything */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 633BD6D60D2ADE230012A314 /* Build configuration list for PBXAggregateTarget "Build Everything" */; buildPhases = ( ); dependencies = ( @@ -18,38 +30,38 @@ 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 */ /* Begin PBXBuildFile section */ 63014A7A1042ACE100534090 /* VLCMediaListPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 63014A781042ACE100534090 /* VLCMediaListPlayer.m */; }; - 63014B7E1042E64A00534090 /* VLCMediaListPlayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 63014B7D1042E64A00534090 /* VLCMediaListPlayer.h */; }; + 63014B7E1042E64A00534090 /* VLCMediaListPlayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 63014B7D1042E64A00534090 /* VLCMediaListPlayer.h */; settings = {ATTRIBUTES = (Public, ); }; }; 6303C43A0CF45CAE0000ECC8 /* VLCMediaListAspect.m in Sources */ = {isa = PBXBuildFile; fileRef = 6303C4390CF45CAE0000ECC8 /* VLCMediaListAspect.m */; }; 6303C43C0CF45CC30000ECC8 /* VLCMediaListAspect.h in Headers */ = {isa = PBXBuildFile; fileRef = 6303C43B0CF45CC30000ECC8 /* VLCMediaListAspect.h */; settings = {ATTRIBUTES = (Public, ); }; }; 632A0E850D3835C400AFC99B /* VLCStreamSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 632A0E830D3835C400AFC99B /* VLCStreamSession.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -87,6 +99,20 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ + 630F6D711045DE4500B03EE4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 633BD6DB0D2ADE4E0012A314; + remoteInfo = "vlc-core"; + }; + 630F6D731045DE4900B03EE4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 8DC2EF4F0486A6940098B216; + remoteInfo = VLCKit; + }; 633BD6ED0D2AE03E0012A314 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; @@ -361,17 +387,17 @@ /* 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"; }; @@ -405,18 +431,19 @@ 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 */, + 633BD6E40D2ADF030012A314 /* Setup VLC contribs */, + 63FFDBCE0D2AE2AE0092FC96 /* Run VLC configure */, + 633BD6DB0D2ADE4E0012A314 /* Make VLC */, + 630F6D6E1045DE4000B03EE4 /* Make VLC and VLCKit */, ); }; /* End PBXProject section */ @@ -432,14 +459,16 @@ /* 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", ); @@ -448,7 +477,7 @@ 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 = ( @@ -456,6 +485,7 @@ inputPaths = ( $SRCROOT/../../../extras/contrib/bootstrap, ); + name = bootstrap; outputPaths = ( $SRCROOT/../../../extras/contrib/config.mak, ); @@ -464,32 +494,34 @@ 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\"\nthen\n exit 0\nfi\nif test $ARCHS = \"x86_64\"\nthen\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\"\nthen\n\trm -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 && $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-nls $args\"\nargs=\"--disable-macosx $args\"\nargs=\"--disable-macosx-defaults $args\"\nargs=\"--enable-macosx-minimal $args\"\nargs=\"--enable-faad $args\"\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\n\nif test \"$CONFIGURATION\" = \"Debug\"; then\n\targs=\"--enable-debug $args\"\nelse\n\targs=\"--enable-release $args\"\nfi\n\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 */ = { @@ -535,14 +567,24 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ + 630F6D721045DE4500B03EE4 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 633BD6DB0D2ADE4E0012A314 /* Make VLC */; + targetProxy = 630F6D711045DE4500B03EE4 /* PBXContainerItemProxy */; + }; + 630F6D741045DE4900B03EE4 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 8DC2EF4F0486A6940098B216 /* VLCKit */; + targetProxy = 630F6D731045DE4900B03EE4 /* PBXContainerItemProxy */; + }; 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 */ = { @@ -552,7 +594,7 @@ }; 63FFDBD30D2AE3070092FC96 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 63FFDBCE0D2AE2AE0092FC96 /* vlc-configure */; + target = 63FFDBCE0D2AE2AE0092FC96 /* Run VLC configure */; targetProxy = 63FFDBD20D2AE3070092FC96 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -561,7 +603,6 @@ 1DEB91AE08733DA50010E9CD /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(NATIVE_ARCH_ACTUAL)"; COPY_PHASE_STRIP = NO; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -594,19 +635,17 @@ 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; }; 1DEB91AF08733DA50010E9CD /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(NATIVE_ARCH_ACTUAL)"; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; FRAMEWORK_VERSION = A; @@ -639,8 +678,8 @@ 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; @@ -650,24 +689,49 @@ 1DEB91B208733DA50010E9CD /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(NATIVE_ARCH)"; - 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 = "$(NATIVE_ARCH)"; - 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; + }; + 630F6D6F1045DE4000B03EE4 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_OPTIMIZATION_LEVEL = 0; + PRODUCT_NAME = "core-framework"; + }; + name = Debug; + }; + 630F6D701045DE4000B03EE4 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + PRODUCT_NAME = "core-framework"; + ZERO_LINK = NO; }; name = Release; }; @@ -783,7 +847,16 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - 633BD6D60D2ADE230012A314 /* Build configuration list for PBXAggregateTarget "vlc-contrib-core-framework" */ = { + 630F6D801045DE6300B03EE4 /* Build configuration list for PBXAggregateTarget "Make VLC and VLCKit" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 630F6D6F1045DE4000B03EE4 /* Debug */, + 630F6D701045DE4000B03EE4 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Debug; + }; + 633BD6D60D2ADE230012A314 /* Build configuration list for PBXAggregateTarget "Build Everything" */ = { isa = XCConfigurationList; buildConfigurations = ( 633BD6D40D2ADE050012A314 /* Debug */, @@ -792,7 +865,7 @@ 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 */, @@ -801,7 +874,7 @@ 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 */, @@ -810,7 +883,7 @@ 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 */,