vlc | branch: master | Felix Paul Kühne <[email protected]> | Thu Jan 12 13:32:04 2012 +0100| [4f97eb9457506211b88c41b4e822def4d9e03493] | committer: Felix Paul Kühne
VLCKit: fixed compilation for x86_64 > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4f97eb9457506211b88c41b4e822def4d9e03493 --- projects/macosx/framework/Configure.sh | 19 +++++++++++++------ .../framework/VLCKit.xcodeproj/project.pbxproj | 4 ++-- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/projects/macosx/framework/Configure.sh b/projects/macosx/framework/Configure.sh index 2c0b5bc..91db070 100644 --- a/projects/macosx/framework/Configure.sh +++ b/projects/macosx/framework/Configure.sh @@ -24,24 +24,29 @@ echo "Building for $ARCHS with sdk=\"$SDKROOT\" in $VLC_BUILD_DIR" args="--disable-nls $args" # Mac OS X related options -args="--disable-macosx-defaults $args" args="--disable-macosx $args" # Disable old gui/macosx args="--disable-macosx-vlc-app $args" # Don't build old vlc.app args="--with-macosx-version-min=10.6 $args" # optional modules +args="--enable-merge-ffmpeg $args" args="--enable-faad $args" args="--enable-flac $args" args="--enable-theora $args" args="--enable-shout $args" args="--enable-caca $args" -args="--enable-vcdx $args" args="--enable-twolame $args" args="--enable-realrtsp $args" args="--enable-libass $args" +args="--enable-macosx-audio $args" +args="--enable-macosx-dialog-provider $args" +args="--enable-macosx-eyetv $args" +args="--enable-macosx-qtkit $args" +args="--enable-macosx-vout $args" # disabled stuff +args="--disable-growl $args" args="--disable-ncurses $args" args="--disable-httpd $args" args="--disable-vlm $args" @@ -90,7 +95,9 @@ for arch in $ARCHS; do export CXXFLAGS="-m64 -arch x86_64" export OBJCFLAGS="-m64 -arch x86_64" export CPPFLAGS="-m64 -arch x86_64" - this_args="--with-contrib=${VLC_SRC_DIR}/extras/contrib/hosts/x86_64-apple-darwin10 $this_args" + this_args="--with-contrib=$top_srcdir/contrib/x86_64-apple-darwin10 $this_args" + export PATH=$top_srcdir/extras/tools/build/bin:$top_srcdir/contrib/x86_64-apple-darwin10/bin:$PATH + export PKG_CONFIG_PATH=$top_srcdir/contrib/x86_64-apple-darwin10/lib/pkgconfig $top_srcdir/configure --build=x86_64-apple-darwin10 $this_args fi if test $arch = "i386"; then @@ -98,15 +105,15 @@ for arch in $ARCHS; do export CXXFLAGS="-m32 -arch i386" export OBJCFLAGS="-m32 -arch i386" export CPPFLAGS="-m32 -arch i386" - this_args="--with-contrib=${VLC_SRC_DIR}/extras/contrib/hosts/i686-apple-darwin10 $this_args" - $top_srcdir/configure --build=i686-apple-darwin10 $this_args + this_args="--with-contrib=$top_srcdir/contrib/i686-apple-darwin9 $this_args" + $top_srcdir/configure --build=i686-apple-darwin9 $this_args fi if test $arch = "ppc"; then export CFLAGS="-m32 -arch ppc" export CXXFLAGS="-m32 -arch ppc" export OBJCFLAGS="-m32 -arch ppc" export CPPFLAGS="-m32 -arch ppc" - this_args="--with-contrib=${VLC_SRC_DIR}/extras/contrib/hosts/powerpc-apple-darwin9 $this_args" + this_args="--with-contrib=$top_srcdir/contrib/powerpc-apple-darwin9 $this_args" $top_srcdir/configure --build=powerpc-apple-darwin9 $this_args fi cd .. diff --git a/projects/macosx/framework/VLCKit.xcodeproj/project.pbxproj b/projects/macosx/framework/VLCKit.xcodeproj/project.pbxproj index bd24f7e..cc98faa 100644 --- a/projects/macosx/framework/VLCKit.xcodeproj/project.pbxproj +++ b/projects/macosx/framework/VLCKit.xcodeproj/project.pbxproj @@ -626,7 +626,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "top_srcdir=`pwd`/../../..\n\nif test $ACTION = \"clean\"\nthen\n exit 0\nfi\n\ncd $top_srcdir && ./bootstrap\n"; + shellScript = "top_srcdir=`pwd`/../../..\n\nif test $ACTION = \"clean\"\nthen\n exit 0\nfi\n\nif test \"$arch\" = \"x86_64\"; then\n export PATH=$top_srcdir/contrib/x86_64-apple-darwin10:$PATH\nfi\n\nexport PATH=$top_srcdir/extras/tools/build/bin:$PATH\n\n"; showEnvVarsInLog = 0; }; 6337548010ED091D0072A0D9 /* make */ = { @@ -675,7 +675,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - 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 rm -rf ./tmp\n\tif test \"$arch\" = \"x86_64\"; then\n ./bootstrap -t x86_64-apple-darwin10\n\telse\n ./bootstrap\n\tfi\n\tmake\ndone\n"; + shellScript = "if test $ACTION = \"clean\"\nthen\nmake clean\nexit 0\nfi\n\necho \"Building tools\"\necho \"\"\ncd $SOURCE_ROOT/../../../extras/tools\n./bootstrap\nmake\n\necho \"Building a set of contribs for $ARCHS...\"\necho \"\"\ncd $SOURCE_ROOT/../../../contrib\n\nfor arch in $ARCHS; do\n\techo \"Making contribs for $arch\"\n\trm -rf vlckit-$arch\t\n\tmkdir vlckit-$arch\n\tcd vlckit-$arch\n\tif test \"$arch\" = \"x86_64\"; then\n export OSX_VERSION=10.6\n ../bootstrap --build=x86_64-apple-darwin10 --host=x86_64-apple-darwin10\n\telse\n ../bootstrap\n\tfi\n\tmake prebuilt\ndone\n"; showEnvVarsInLog = 0; }; 63FFDBCD0D2AE2AE0092FC96 /* configure */ = { _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
