]> git.sesse.net Git - vlc/blobdiff - projects/macosx/framework/VLCKit.xcodeproj/project.pbxproj
VLCKit: Remove contrib dependency files.
[vlc] / projects / macosx / framework / VLCKit.xcodeproj / project.pbxproj
index a3cb2c83c8b7af0299f743f7942873661e727f12..ae8e76d1c159f22e8629af67be9af01d96956940 100644 (file)
@@ -7,18 +7,6 @@
        objects = {
 
 /* 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 */ = {
                        isa = PBXAggregateTarget;
                        buildConfigurationList = 6337548110ED093B0072A0D9 /* Build configuration list for PBXAggregateTarget "Make VLC" */;
@@ -39,6 +27,7 @@
                        dependencies = (
                                633BD6EE0D2AE03E0012A314 /* PBXTargetDependency */,
                                63FFDBD30D2AE3070092FC96 /* PBXTargetDependency */,
+                               633754FA10ED103B0072A0D9 /* PBXTargetDependency */,
                                633BD6F20D2AE0430012A314 /* PBXTargetDependency */,
                        );
                        name = "Build Everything";
@@ -48,8 +37,7 @@
                        isa = PBXAggregateTarget;
                        buildConfigurationList = 633BD6EC0D2ADF460012A314 /* Build configuration list for PBXAggregateTarget "Setup VLC contribs" */;
                        buildPhases = (
-                               633BD6E30D2ADF030012A314 /* bootstrap */,
-                               633BD6EB0D2ADF280012A314 /* make bin */,
+                               633BD6E30D2ADF030012A314 /* make */,
                        );
                        dependencies = (
                        );
                        name = "Run VLC configure";
                        productName = "vlc-bootstrap";
                };
+               CC61094C112F4AB500FAFD22 /* Make VLC and VLCKit */ = {
+                       isa = PBXAggregateTarget;
+                       buildConfigurationList = CC61095D112F4AD400FAFD22 /* Build configuration list for PBXAggregateTarget "Make VLC and VLCKit" */;
+                       buildPhases = (
+                       );
+                       dependencies = (
+                               CC610951112F4ABB00FAFD22 /* PBXTargetDependency */,
+                               CC610953112F4ABF00FAFD22 /* PBXTargetDependency */,
+                       );
+                       name = "Make VLC and VLCKit";
+                       productName = "Make VLC and VLCKit";
+               };
 /* 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 */; 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, ); }; };
+               63098FDC110E7159005F46AE /* VLCExtensionsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 63098FDA110E7159005F46AE /* VLCExtensionsManager.m */; };
+               63099116110F0EC3005F46AE /* VLCExtension.m in Sources */ = {isa = PBXBuildFile; fileRef = 63099114110F0EC3005F46AE /* VLCExtension.m */; };
+               6309994B110FC791005F46AE /* VLCExtension.h in Headers */ = {isa = PBXBuildFile; fileRef = 63099949110FC791005F46AE /* VLCExtension.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               6309994C110FC791005F46AE /* VLCExtensionsManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 6309994A110FC791005F46AE /* VLCExtensionsManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
                632A0E850D3835C400AFC99B /* VLCStreamSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 632A0E830D3835C400AFC99B /* VLCStreamSession.h */; settings = {ATTRIBUTES = (Public, ); }; };
                632A0E860D3835C400AFC99B /* VLCStreamSession.m in Sources */ = {isa = PBXBuildFile; fileRef = 632A0E840D3835C400AFC99B /* VLCStreamSession.m */; };
                632A0EC30D38392E00AFC99B /* VLCStreamOutput.h in Headers */ = {isa = PBXBuildFile; fileRef = 632A0EC10D38392E00AFC99B /* VLCStreamOutput.h */; settings = {ATTRIBUTES = (Public, ); }; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
-               630F6D731045DE4900B03EE4 /* PBXContainerItemProxy */ = {
+               633754F910ED103B0072A0D9 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
                        proxyType = 1;
-                       remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
-                       remoteInfo = VLCKit;
-               };
-               633754B010ED0BB50072A0D9 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = 6337547910ED090A0072A0D9 /* Make VLC 2 */;
-                       remoteInfo = "Make VLC 2";
+                       remoteGlobalIDString = 6337547910ED090A0072A0D9;
+                       remoteInfo = "Make VLC";
                };
                633BD6ED0D2AE03E0012A314 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        remoteGlobalIDString = 63FFDBCE0D2AE2AE0092FC96;
                        remoteInfo = "vlc-bootstrap";
                };
+               CC610950112F4ABB00FAFD22 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 6337547910ED090A0072A0D9;
+                       remoteInfo = "Make VLC";
+               };
+               CC610952112F4ABF00FAFD22 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
+                       remoteInfo = VLCKit;
+               };
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
                63014A781042ACE100534090 /* VLCMediaListPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCMediaListPlayer.m; sourceTree = "<group>"; };
                63014B7D1042E64A00534090 /* VLCMediaListPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCMediaListPlayer.h; path = Public/VLCMediaListPlayer.h; sourceTree = "<group>"; };
                63030CC70CCA652C0088ECD1 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; name = Info.plist; path = Resources/Info.plist; sourceTree = "<group>"; };
-               6303C4390CF45CAE0000ECC8 /* VLCMediaListAspect.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCMediaListAspect.m; sourceTree = "<group>"; };
-               6303C43B0CF45CC30000ECC8 /* VLCMediaListAspect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCMediaListAspect.h; path = Public/VLCMediaListAspect.h; sourceTree = "<group>"; };
+               63098FDA110E7159005F46AE /* VLCExtensionsManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCExtensionsManager.m; sourceTree = "<group>"; };
+               63099114110F0EC3005F46AE /* VLCExtension.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCExtension.m; sourceTree = "<group>"; };
+               63099949110FC791005F46AE /* VLCExtension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCExtension.h; path = Public/VLCExtension.h; sourceTree = "<group>"; };
+               6309994A110FC791005F46AE /* VLCExtensionsManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCExtensionsManager.h; path = Public/VLCExtensionsManager.h; sourceTree = "<group>"; };
                632A0E830D3835C400AFC99B /* VLCStreamSession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCStreamSession.h; path = Public/VLCStreamSession.h; sourceTree = "<group>"; };
                632A0E840D3835C400AFC99B /* VLCStreamSession.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCStreamSession.m; sourceTree = "<group>"; };
                632A0EC10D38392E00AFC99B /* VLCStreamOutput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCStreamOutput.h; path = Public/VLCStreamOutput.h; sourceTree = "<group>"; };
                                637D5ADB0CF6F2720073EA45 /* VLCMediaDiscoverer.m */,
                                EF78BD410CAEEFF600354E6E /* VLCMediaList.m */,
                                63014A781042ACE100534090 /* VLCMediaListPlayer.m */,
-                               6303C4390CF45CAE0000ECC8 /* VLCMediaListAspect.m */,
                                EF8BB8CF0CAFA8D80038A613 /* VLCMediaPlayer.m */,
                                EF78BD400CAEEFF600354E6E /* VLCMediaLibrary.m */,
                                A7A0CEA30D2EF13000F2C039 /* VLCVideoCommon.m */,
                                EF78BD450CAEEFF600354E6E /* VLCVideoView.m */,
                                EF78BD440CAEEFF600354E6E /* VLCTime.m */,
                                EF73118F0CB5797B009473B4 /* VLCAudio.m */,
+                               63098FDA110E7159005F46AE /* VLCExtensionsManager.m */,
+                               63099114110F0EC3005F46AE /* VLCExtension.m */,
                                632A0F7B0D38F78500AFC99B /* Stream */,
                        );
                        path = Sources;
                                EF78BD130CAEEEE700354E6E /* VLCMedia.h */,
                                637D5ABC0CF6F2650073EA45 /* VLCMediaDiscoverer.h */,
                                EF78BD160CAEEEE700354E6E /* VLCMediaList.h */,
-                               6303C43B0CF45CC30000ECC8 /* VLCMediaListAspect.h */,
                                63014B7D1042E64A00534090 /* VLCMediaListPlayer.h */,
                                EF8BB8CE0CAFA8D80038A613 /* VLCMediaPlayer.h */,
                                EF78BD150CAEEEE700354E6E /* VLCMediaLibrary.h */,
                                EF78BD1A0CAEEEE700354E6E /* VLCVideoView.h */,
                                EF78BD190CAEEEE700354E6E /* VLCTime.h */,
                                EF73118E0CB5797B009473B4 /* VLCAudio.h */,
+                               63099949110FC791005F46AE /* VLCExtension.h */,
+                               6309994A110FC791005F46AE /* VLCExtensionsManager.h */,
                                632A0F7C0D38F79200AFC99B /* Stream */,
                        );
                        name = Public;
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               6303C43C0CF45CC30000ECC8 /* VLCMediaListAspect.h in Headers */,
                                EF78BD100CAEEEC300354E6E /* VLCEventManager.h in Headers */,
                                EF78BD1B0CAEEEE700354E6E /* VLCKit.h in Headers */,
                                EF78BD1C0CAEEEE700354E6E /* VLCMedia.h in Headers */,
                                632A0E850D3835C400AFC99B /* VLCStreamSession.h in Headers */,
                                632A0EC30D38392E00AFC99B /* VLCStreamOutput.h in Headers */,
                                63014B7E1042E64A00534090 /* VLCMediaListPlayer.h in Headers */,
+                               6309994B110FC791005F46AE /* VLCExtension.h in Headers */,
+                               6309994C110FC791005F46AE /* VLCExtensionsManager.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        projectRoot = "";
                        targets = (
                                633BD6D20D2ADE040012A314 /* Build Everything */,
-                               8DC2EF4F0486A6940098B216 /* VLCKit */,
                                633BD6E40D2ADF030012A314 /* Setup VLC contribs */,
                                63FFDBCE0D2AE2AE0092FC96 /* Run VLC configure */,
                                6337547910ED090A0072A0D9 /* Make VLC */,
-                               630F6D6E1045DE4000B03EE4 /* Make VLC and VLCKit */,
+                               8DC2EF4F0486A6940098B216 /* VLCKit */,
+                               CC61094C112F4AB500FAFD22 /* Make VLC and VLCKit */,
                        );
                };
 /* End PBXProject section */
                        files = (
                        );
                        inputPaths = (
-                               "$(SRCROOT)/../../../configure.ac",
                                "$(SRCROOT)/../../../bootstrap",
                        );
                        name = bootstrap;
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
-                       shellScript = "cd  $SYMROOT/vlc_build_dir\nmake";
+                       shellScript = "for arch in $ARCHS; do\n\techo \"Make [$arch]\"\n\tcd  $VLC_BUILD_DIR/$arch\n\tmake\ndone";
                };
                633754D310ED0D330072A0D9 /* install */ = {
                        isa = PBXShellScriptBuildPhase;
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
-                       shellScript = "cd  $SYMROOT/vlc_build_dir\ncd src\necho \"Installing libvlc, libvlccore, vlc\"\nmake install --quiet > /dev/null";
+                       shellScript = "for arch in $ARCHS; do\n\tcd  $VLC_BUILD_DIR/$arch\n\tcd src\n\techo \"Installing  [$arch] libvlc, libvlccore, vlc\"\n\tmake install --quiet > /dev/null\ndone";
                };
-               633BD6E30D2ADF030012A314 /* bootstrap */ = {
+               633BD6E30D2ADF030012A314 /* make */ = {
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        );
                        inputPaths = (
-                               $SRCROOT/../../../extras/contrib/bootstrap,
-                       );
-                       name = bootstrap;
-                       outputPaths = (
-                               $SRCROOT/../../../extras/contrib/config.mak,
                        );
-                       runOnlyForDeploymentPostprocessing = 0;
-                       shellPath = /bin/sh;
-                       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 /* make bin */ = {
-                       isa = PBXShellScriptBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                       );
-                       inputPaths = (
-                       );
-                       name = "make bin";
+                       name = make;
                        outputPaths = (
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
-                       shellScript = "if test \"$ACTION\" = \"clean\"; then\n    exit 0\nfi\ncd ../../../extras/contrib && make\n";
+                       shellScript = "cd ../../../extras/contrib\n\nif test $ACTION = \"clean\"\nthen\n    make clean\n    exit 0\nfi\n\necho \"Building a set of contribs for $ARCHS...\"\necho \"\"\n\nfor arch in $ARCHS; do\n\techo \"Making contribs for $arch\"\n\tif test \"$arch\" = \"x86_64\"; then\n          ./bootstrap x86_64-apple-darwin10\n\telse\n          ./bootstrap\n\tfi\n\tmake\ndone\n";
                        showEnvVarsInLog = 0;
                };
                63FFDBCD0D2AE2AE0092FC96 /* configure */ = {
                                EF78BEF40CAF07E500354E6E /* VLCVideoView.m in Sources */,
                                EF8BB8D10CAFA8D80038A613 /* VLCMediaPlayer.m in Sources */,
                                EF7311910CB5797B009473B4 /* VLCAudio.m in Sources */,
-                               6303C43A0CF45CAE0000ECC8 /* VLCMediaListAspect.m in Sources */,
                                637D5ADC0CF6F2720073EA45 /* VLCMediaDiscoverer.m in Sources */,
                                6341FCB10D2C0936002A97B7 /* VLCVideoLayer.m in Sources */,
                                A7A0CEA50D2EF13000F2C039 /* VLCVideoCommon.m in Sources */,
                                632A0E860D3835C400AFC99B /* VLCStreamSession.m in Sources */,
                                632A0EC40D38392E00AFC99B /* VLCStreamOutput.m in Sources */,
                                63014A7A1042ACE100534090 /* VLCMediaListPlayer.m in Sources */,
+                               63098FDC110E7159005F46AE /* VLCExtensionsManager.m in Sources */,
+                               63099116110F0EC3005F46AE /* VLCExtension.m in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
-               630F6D741045DE4900B03EE4 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = 8DC2EF4F0486A6940098B216 /* VLCKit */;
-                       targetProxy = 630F6D731045DE4900B03EE4 /* PBXContainerItemProxy */;
-               };
-               633754B110ED0BB50072A0D9 /* PBXTargetDependency */ = {
+               633754FA10ED103B0072A0D9 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = 6337547910ED090A0072A0D9 /* Make VLC */;
-                       targetProxy = 633754B010ED0BB50072A0D9 /* PBXContainerItemProxy */;
+                       targetProxy = 633754F910ED103B0072A0D9 /* PBXContainerItemProxy */;
                };
                633BD6EE0D2AE03E0012A314 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = 63FFDBCE0D2AE2AE0092FC96 /* Run VLC configure */;
                        targetProxy = 63FFDBD20D2AE3070092FC96 /* PBXContainerItemProxy */;
                };
+               CC610951112F4ABB00FAFD22 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 6337547910ED090A0072A0D9 /* Make VLC */;
+                       targetProxy = CC610950112F4ABB00FAFD22 /* PBXContainerItemProxy */;
+               };
+               CC610953112F4ABF00FAFD22 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 8DC2EF4F0486A6940098B216 /* VLCKit */;
+                       targetProxy = CC610952112F4ABF00FAFD22 /* PBXContainerItemProxy */;
+               };
 /* End PBXTargetDependency section */
 
 /* Begin XCBuildConfiguration section */
                                );
                                INFOPLIST_FILE = Resources/Info.plist;
                                INSTALL_PATH = "@loader_path/../Frameworks";
-                               LD_FLAGS_LIBINTL = "-dylib_file @loader_path/../lib/vlc_libintl.dylib:$(VLC_FRAMEWORK)/lib/vlc_libintl.dylib";
-                               LD_FLAGS_LIBVLC = "-dylib_file @loader_path/lib/libvlc.dylib:$(VLC_FRAMEWORK)/lib/libvlc.dylib";
-                               LD_FLAGS_LIBVLC_CONTROL = "-dylib_file @loader_path/lib/libvlc-control.dylib:$(VLC_FRAMEWORK)/lib/libvlc-control.dylib";
-                               LIBRARY_SEARCH_PATHS = "$(VLC_FRAMEWORK)/lib";
-                               ONLY_ACTIVE_ARCH = YES;
+                               LIBRARY_SEARCH_PATHS = "$(CONFIGURATION_BUILD_DIR)/$(PRODUCT_NAME).$(WRAPPER_EXTENSION)/lib";
                                OTHER_LDFLAGS = (
+                                       "-lvlccore",
                                        "-single_module",
                                        "-read_only_relocs",
                                        suppress,
                                PRODUCT_NAME = VLCKit;
                                SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
                                SDKROOT = macosx10.5;
-                               VLC_BUILD_DIR = "$(SYMROOT)/vlc_build_dir";
-                               VLC_FRAMEWORK = "$(TARGET_BUILD_DIR)/$(PROJECT_NAME).framework";
-                               VLC_SRC_DIR = ../../..;
                                WRAPPER_EXTENSION = framework;
                        };
                        name = Debug;
                                );
                                INFOPLIST_FILE = Resources/Info.plist;
                                INSTALL_PATH = "@loader_path/../Frameworks";
-                               LD_FLAGS_LIBINTL = "-dylib_file @loader_path/../lib/vlc_libintl.dylib:$(VLC_FRAMEWORK)/lib/vlc_libintl.dylib";
-                               LD_FLAGS_LIBVLC = "-dylib_file @loader_path/lib/libvlc.dylib:$(VLC_FRAMEWORK)/lib/libvlc.dylib -dylib_file @loader_path/../lib/libvlc.dylib:$(VLC_FRAMEWORK)/lib/libvlc.dylib";
-                               LD_FLAGS_LIBVLC_CONTROL = "-dylib_file @loader_path/lib/libvlc-control.dylib:$(VLC_FRAMEWORK)/lib/libvlc-control.dylib";
-                               LIBRARY_SEARCH_PATHS = "$(VLC_FRAMEWORK)/lib";
-                               ONLY_ACTIVE_ARCH = YES;
+                               LIBRARY_SEARCH_PATHS = "$(CONFIGURATION_BUILD_DIR)/$(PRODUCT_NAME).$(WRAPPER_EXTENSION)/lib";
                                OTHER_LDFLAGS = (
+                                       "-lvlccore",
                                        "-single_module",
                                        "-read_only_relocs",
                                        suppress,
                                        "-lvlc",
-                                       "$(LD_FLAGS_LIBINTL)",
-                                       "$(LD_FLAGS_LIBVLC)",
-                                       "$(LD_FLAGS_LIBVLC_CONTROL)",
                                );
                                PRIVATE_HEADERS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/PrivateHeaders";
                                PRODUCT_NAME = VLCKit;
                                SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
                                SDKROOT = macosx10.5;
-                               VLC_BUILD_DIR = "$(SYMROOT)/vlc_build_dir";
-                               VLC_FRAMEWORK = "$(TARGET_BUILD_DIR)/$(PROJECT_NAME).framework";
-                               VLC_SRC_DIR = ../../..;
                                WRAPPER_EXTENSION = framework;
                        };
                        name = Release;
                1DEB91B208733DA50010E9CD /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+                               ARCHS = (
+                                       x86_64,
+                                       i386,
+                               );
+                               GCC_C_LANGUAGE_STANDARD = c99;
                                GCC_ENABLE_OBJC_GC = supported;
                                GCC_VERSION = com.apple.compilers.llvmgcc42;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                ONLY_ACTIVE_ARCH = YES;
                                PREBINDING = NO;
                                SDKROOT = macosx10.5;
+                               VALID_ARCHS = "i386 ppc ppc64 ppc7400 x86_64";
+                               VLC_BUILD_DIR = "$(SYMROOT)/$(CONFIGURATION)/vlc_build_dir";
+                               VLC_SRC_DIR = "$(SRCROOT)/../../..";
                        };
                        name = Debug;
                };
                1DEB91B308733DA50010E9CD /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+                               ARCHS = (
+                                       x86_64,
+                                       i386,
+                               );
+                               GCC_C_LANGUAGE_STANDARD = c99;
                                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;
+                               ONLY_ACTIVE_ARCH = NO;
                                PREBINDING = NO;
                                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;
+                               VALID_ARCHS = "i386 ppc ppc64 ppc7400 x86_64";
+                               VLC_BUILD_DIR = "$(SYMROOT)/$(CONFIGURATION)/vlc_build_dir";
+                               VLC_SRC_DIR = "$(SRCROOT)/../../..";
                        };
                        name = Release;
                };
                6337547C10ED090B0072A0D9 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               PRODUCT_NAME = VLC;
                        };
                        name = Debug;
                };
                6337547D10ED090B0072A0D9 /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               COPY_PHASE_STRIP = YES;
-                               DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-                               GCC_ENABLE_FIX_AND_CONTINUE = NO;
-                               PRODUCT_NAME = "Make VLC 2";
-                               ZERO_LINK = NO;
+                               PRODUCT_NAME = VLC;
                        };
                        name = Release;
                };
                        };
                        name = Release;
                };
+               CC61094D112F4AB600FAFD22 /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               COPY_PHASE_STRIP = NO;
+                               GCC_DYNAMIC_NO_PIC = NO;
+                               GCC_OPTIMIZATION_LEVEL = 0;
+                               PRODUCT_NAME = "Make VLC and VLCKit";
+                       };
+                       name = Debug;
+               };
+               CC61094E112F4AB600FAFD22 /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               COPY_PHASE_STRIP = YES;
+                               DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+                               GCC_ENABLE_FIX_AND_CONTINUE = NO;
+                               PRODUCT_NAME = "Make VLC and VLCKit";
+                               ZERO_LINK = NO;
+                       };
+                       name = Release;
+               };
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
                        defaultConfigurationIsVisible = 0;
                        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" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Debug;
                };
+               CC61095D112F4AD400FAFD22 /* Build configuration list for PBXAggregateTarget "Make VLC and VLCKit" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               CC61094D112F4AB600FAFD22 /* Debug */,
+                               CC61094E112F4AB600FAFD22 /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Debug;
+               };
 /* End XCConfigurationList section */
        };
        rootObject = 0867D690FE84028FC02AAC07 /* Project object */;