Commit 7c33ab92 authored by Pierre's avatar Pierre

macosx/framework: Use the new "vout display".

parent d5e6d2a8
......@@ -74,8 +74,7 @@ void __catch_exception( void * e, const char * function, const char * file, int
[defaultParams addObject:@"--no-video-title-show"]; // Don't show the title on overlay when starting to play
[defaultParams addObject:@"--no-sout-keep"];
[defaultParams addObject:@"--ignore-config"]; // Don't read and write VLC config files
[defaultParams addObject:@"--opengl-provider=minimal_macosx"]; // Use minimal_macosx
[defaultParams addObject:@"--vout=minimal_macosx"];
[defaultParams addObject:@"--vout=macosx"];
[defaultParams addObject:@"--text-renderer=quartztext"]; // our CoreText-based renderer
[defaultParams addObject:@"--verbose=-1"]; // Don't polute the log
[defaultParams addObject:@"--no-color"];
......
......@@ -441,8 +441,8 @@
633BD6D20D2ADE040012A314 /* Build Everything */,
8DC2EF4F0486A6940098B216 /* VLCKit */,
633BD6E40D2ADF030012A314 /* Setup VLC contribs */,
633BD6DB0D2ADE4E0012A314 /* Make VLC */,
63FFDBCE0D2AE2AE0092FC96 /* Run VLC configure */,
633BD6DB0D2ADE4E0012A314 /* Make VLC */,
630F6D6E1045DE4000B03EE4 /* Make VLC and VLCKit */,
);
};
......@@ -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-macosx\"\nargs=\"--enable-macosx-minimal\"\nargs=\"--enable-faad\"\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\nargs=\"--enable-macosx $args\"\nif test \"$CONFIGURATION\" = \"Debug\"; then\nargs=\"--enable-debug $args\"\nelse\nargs=\"--enable-release $args\"\nfi\nargs=\"--disable-nls $args\"\nargs=\"--disable-macosx-defaults $args\"\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-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 */ = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment