[vlc-devel] commit: configure: added a minimal-macosx item, which will just compile the macosx-only modules we need within VLCKit ( Felix Paul Kühne )
git version control
git at videolan.org
Sat Dec 19 23:57:18 CET 2009
vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Sat Dec 19 23:56:49 2009 +0100| [4372508cafbe8e7054c82d4789f39be8169a38f3] | committer: Felix Paul Kühne
configure: added a minimal-macosx item, which will just compile the macosx-only modules we need within VLCKit
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4372508cafbe8e7054c82d4789f39be8169a38f3
---
configure.ac | 29 ++++++++++++++++++-
.../framework/VLCKit.xcodeproj/project.pbxproj | 2 +-
2 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index f42ae16..652deac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1857,6 +1857,7 @@ AS_IF([test "${enable_growl}" != "no"], [
AC_CHECK_HEADERS(Growl/GrowlDefines.h, [
VLC_ADD_PLUGIN([growl])
VLC_ADD_LDFLAGS([growl], [-Wl,-framework,Growl,-framework,AppKit])
+ VLC_ADD_OBJCFLAGS([growl], [-fobjc-exceptions] )
])
]
)
@@ -4454,7 +4455,7 @@ dnl
dnl MacOS X video output/gui modules
dnl
AC_ARG_ENABLE(macosx,
- [ --enable-macosx MacOS X support (default enabled on MacOS X)])
+ [ --enable-macosx full Mac OS X support (default enabled on Mac OS X)])
if test "x${enable_macosx}" = "xyes"
then
VLC_ADD_LDFLAGS([access_eyetv], [-Wl,-framework,Foundation])
@@ -4473,7 +4474,7 @@ then
VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,WebKit])
VLC_ADD_LDFLAGS([opengllayer qtcapture], [-Wl,-framework,QuartzCore])
VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,CoreVideo])
- VLC_ADD_OBJCFLAGS([macosx minimal_macosx opengllayer growl opengllayer], [-fobjc-exceptions] )
+ VLC_ADD_OBJCFLAGS([macosx minimal_macosx opengllayer growl], [-fobjc-exceptions] )
VLC_ADD_PLUGIN([access_eyetv])
VLC_ADD_PLUGIN([qtcapture])
@@ -4483,6 +4484,30 @@ then
fi
dnl
+dnl MacOS X video output/gui modules
+dnl
+AC_ARG_ENABLE(macosx-minimal,
+ [ --enable-macosx-minimal minimal Mac OS X support (default disabled)])
+if test "x${enable_macosx_minimal}" = "xyes"
+then
+ VLC_ADD_LDFLAGS([minimal_macosx opengllayer qtcapture],[-Wl,-framework,Cocoa])
+ VLC_ADD_LDFLAGS([minimal_macosx opengllayer],[-Wl,-framework,OpenGL])
+ VLC_ADD_LDFLAGS([minimal_macosx], [-Wl,-framework,Carbon])
+ VLC_ADD_LDFLAGS([minimal_macosx], [-Wl,-framework,CoreServices])
+ VLC_ADD_LDFLAGS([minimal_macosx], [-Wl,-framework,AGL])
+
+ VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,QTKit])
+ VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,CoreAudio])
+ VLC_ADD_LDFLAGS([opengllayer qtcapture], [-Wl,-framework,QuartzCore])
+ VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,CoreVideo])
+ VLC_ADD_OBJCFLAGS([minimal_macosx opengllayer], [-fobjc-exceptions] )
+
+ VLC_ADD_PLUGIN([qtcapture])
+ VLC_ADD_PLUGIN([minimal_macosx])
+ VLC_ADD_PLUGIN([opengllayer])
+fi
+
+dnl
dnl QNX RTOS module
dnl
AC_ARG_ENABLE(qnx,
diff --git a/projects/macosx/framework/VLCKit.xcodeproj/project.pbxproj b/projects/macosx/framework/VLCKit.xcodeproj/project.pbxproj
index 5c25a47..7ef018f 100644
--- 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=\"--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 $a
rgs\"\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-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=\"--dis
able-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";
showEnvVarsInLog = 0;
};
EF78BD2E0CAEEF9500354E6E /* ShellScript */ = {
More information about the vlc-devel
mailing list