macosx/framework: Remove unneeded configure flags.

diff --git a/projects/macosx/framework/Pre-Compile.sh b/projects/macosx/framework/Pre-Compile.sh
index 1dc48bcbed7a61cfb24ee97e524503085b8d76f2..aa17809430f13d055d681b58fb383769fea2acf0 100644 (file)
--- a/projects/macosx/framework/Pre-Compile.sh
+++ b/projects/macosx/framework/Pre-Compile.sh
@@ -147,12 +147,6 @@ if test "${ACTION}" = "build"; then
         popd > /dev/null
     fi
 
-    # remove stuff we don't need
-    if [ "$FULL_PRODUCT_NAME" = "VLCKit.framework" ] ; then
-        echo "Removing module libmacosx_plugin.dylib"
-        rm ${target_modules}/libmacosx_plugin.dylib
-    fi
-
     ##########################
     # Build the library folder
     echo "Building library folder... ${linked_libs}"

diff --git a/projects/macosx/framework/VLCKit.xcodeproj/project.pbxproj b/projects/macosx/framework/VLCKit.xcodeproj/project.pbxproj
index fafdbbb321d5acbbf8e146e92979aa36ae7b71aa..8992bf0b67a0805b6a3070cadc8e24eddaaa7a82 100644 (file)
--- a/projects/macosx/framework/VLCKit.xcodeproj/project.pbxproj
+++ b/projects/macosx/framework/VLCKit.xcodeproj/project.pbxproj
@@ -521,7 +521,7 @@
                        );
                        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\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";
+                       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-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 */ = {