VLCKit: Remove contrib dependency files.

[vlc] / projects / macosx / framework / VLCKit.xcodeproj / project.pbxproj

diff --git a/projects/macosx/framework/VLCKit.xcodeproj/project.pbxproj b/projects/macosx/framework/VLCKit.xcodeproj/project.pbxproj
index 5f22a67c78cbc5de97bc584eab5efc8da9ae53c4..ae8e76d1c159f22e8629af67be9af01d96956940 100644 (file)
--- a/projects/macosx/framework/VLCKit.xcodeproj/project.pbxproj
+++ b/projects/macosx/framework/VLCKit.xcodeproj/project.pbxproj
@@ -56,6 +56,18 @@
                        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 */
@@ -128,6 +140,20 @@
                        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 */
@@ -420,6 +446,7 @@
                                63FFDBCE0D2AE2AE0092FC96 /* Run VLC configure */,
                                6337547910ED090A0072A0D9 /* Make VLC */,
                                8DC2EF4F0486A6940098B216 /* VLCKit */,
+                               CC61094C112F4AB500FAFD22 /* Make VLC and VLCKit */,
                        );
                };
 /* End PBXProject section */
@@ -464,7 +491,7 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
-                       shellScript = "for arch in $ARCHS; do\n\techo \"Make [$arch]\"\n\tcd  $SYMROOT/vlc_build_dir/$arch\n\tmake\ndone";
+                       shellScript = "for arch in $ARCHS; do\n\techo \"Make [$arch]\"\n\tcd  $VLC_BUILD_DIR/$arch\n\tmake\ndone";
                };
                633754D310ED0D330072A0D9 /* install */ = {
                        isa = PBXShellScriptBuildPhase;
@@ -484,7 +511,7 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
-                       shellScript = "for arch in $ARCHS; do\n\tcd  $SYMROOT/vlc_build_dir/$arch\n\tcd src\n\techo \"Installing  [$arch] libvlc, libvlccore, vlc\"\n\tmake install --quiet > /dev/null\ndone";
+                       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 /* make */ = {
                        isa = PBXShellScriptBuildPhase;
@@ -492,11 +519,9 @@
                        files = (
                        );
                        inputPaths = (
-                               $SRCROOT/../../../extras/contrib/bootstrap,
                        );
                        name = make;
                        outputPaths = (
-                               $SRCROOT/../../../extras/contrib/config.mak,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
@@ -581,6 +606,16 @@
                        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 */
@@ -605,10 +640,7 @@
                                );
                                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";
+                               LIBRARY_SEARCH_PATHS = "$(CONFIGURATION_BUILD_DIR)/$(PRODUCT_NAME).$(WRAPPER_EXTENSION)/lib";
                                OTHER_LDFLAGS = (
                                        "-lvlccore",
                                        "-single_module",
@@ -620,9 +652,6 @@
                                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;
@@ -645,10 +674,7 @@
                                );
                                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";
+                               LIBRARY_SEARCH_PATHS = "$(CONFIGURATION_BUILD_DIR)/$(PRODUCT_NAME).$(WRAPPER_EXTENSION)/lib";
                                OTHER_LDFLAGS = (
                                        "-lvlccore",
                                        "-single_module",
@@ -660,9 +686,6 @@
                                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;
@@ -682,6 +705,9 @@
                                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;
                };
@@ -700,6 +726,9 @@
                                ONLY_ACTIVE_ARCH = NO;
                                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 = Release;
                };
@@ -788,6 +817,27 @@
                        };
                        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 */
@@ -845,6 +895,15 @@
                        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 */;