VLC_ADD_LDFLAGS([mkv mp4], [-framework IOKit -framework CoreFoundation])
VLC_ADD_CFLAGS([libvlc vlc],[-x objective-c])
VLC_ADD_LDFLAGS([vlc],[-undefined dynamic_lookup])
+ VLC_ADD_CFLAGS([motion],[-fconstant-cfstrings])
+ VLC_ADD_LDFLAGS([motion],[-framework IOKit -framework CoreFoundation])
AC_ARG_ENABLE(macosx-defaults,
[ --enable-macosx-defaults Build the default configuration on Mac OS X (default enabled)])
if test "x${enable_macosx_defaults}" != "xno"
AC_ARG_ENABLE(libtool,
[ --enable-libtool use libtool (default enabled)])
+AS_IF([test "x{enable_libtool}" = "xno"], [
+ AC_MSG_WARN([Disabling libtool is strongly discouraged. There are known bugs.])
+])
AM_CONDITIONAL(USE_LIBTOOL, [test "x${enable_libtool}" != "xno"] )
AC_ARG_WITH(macosx-sdk,
[ --with-macosx-sdk compile with the Mac OS X 10.4u SDK],[], with_macosx_sdk=no)
if test "${with_macosx_sdk}" != "no" ; then
- CFLAGS_save="${CFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4"; CFLAGS="${CFLAGS_save}"
- CXXFLAGS_save="${CXXFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4"; CXXFLAGS="${CXXFLAGS_save}"
- OBJCFLAGS_save="${OBJCFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4"; OBJCFLAGS="${OBJCFLAGS_save}"
- LDFLAGS_save="${LDFLAGS_save} -isysroot /Developer/SDKs/MacOSX10.4u.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk"; LDFLAGS="${LDFLAGS_save}"
- export MACOSX_DEPLOYMENT_TARGET=10.4
+ CC="${CC} -isysroot /Developer/SDKs/MacOSX10.4u.sdk"
+ CXX="${CXX} -isysroot /Developer/SDKs/MacOSX10.4u.sdk"
+ OBJC="${OBJC} -isysroot /Developer/SDKs/MacOSX10.4u.sdk"
+ LD="${LD} -syslibroot /Developer/SDKs/MacOSX10.4u.sdk"
+ CFLAGS_save="${CFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=10.4 -mmacosx-version-min=10.4"; CFLAGS="${CFLAGS_save}"
+ CXXFLAGS_save="${CXXFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=10.4 -mmacosx-version-min=10.4"; CXXFLAGS="${CXXFLAGS_save}"
+ OBJCFLAGS_save="${OBJCFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=10.4 -mmacosx-version-min=10.4"; OBJCFLAGS="${OBJCFLAGS_save}"
MACOSX_DEPLOYMENT_TARGET="10.4"
+ export MACOSX_DEPLOYMENT_TARGET
fi
dnl
])
])
AC_SUBST(INCLUDED_LIBINTL)
-XGETTEXT="${XGETTEXT} --keyword=_NS --keyword=_ANS"
dnl
dnl Iconv stuff
AC_TRY_COMPILE([],,ac_cv_c_omit_frame_pointer=yes, ac_cv_c_omit_frame_pointer=no)])
if test "${ac_cv_c_omit_frame_pointer}" != "no"; then
CFLAGS_OPTIM_NODEBUG="${CFLAGS_OPTIM_NODEBUG} -fomit-frame-pointer"
- # this plugin does not compile without -fomit-frame-pointer, damn gcc!
- VLC_ADD_CFLAGS([i420_yuy2_mmx],[-fomit-frame-pointer])
+ # these plugins do not compile without -fomit-frame-pointer, damn gcc!
+ VLC_ADD_CFLAGS([i420_yuy2_mmx i420_yuy2_sse2],[-fomit-frame-pointer])
fi
dnl Check for -fvisibility=hidden
dnl
dnl Accelerated modules
dnl
-MMX_MODULES="memcpymmx i420_rgb_mmx i422_yuy2_mmx i420_ymga_mmx"
+MMX_MODULES="memcpymmx i420_rgb_mmx i420_yuy2_mmx i422_yuy2_mmx i420_ymga_mmx"
#MMX_MODULES="${MMX_MODULES} idctmmx motionmmx"
MMXEXT_MODULES="memcpymmxext"
#MMXEXT_MODULES="${MMXEXT_MODULES} idctmmxext motionmmxext"
THREEDNOW_MODULES="memcpy3dn"
SSE_MODULES=""
-SSE2_MODULES=""
+SSE2_MODULES="i420_rgb_sse2 i420_yuy2_sse2"
ALTIVEC_MODULES="memcpyaltivec i420_yuy2_altivec"
#ALTIVEC_MODULES="${ALTIVEC_MODULES} idctaltivec motionaltivec"
-if test "${enable_gprof}" != "yes" -a "${enable_debug}" != "yes"
-then
- MMX_MODULES="${MMX_MODULES} i420_yuy2_mmx"
- SSE2_MODULES="${SSE2_MODULES} i420_yuy2_sse2"
-fi
-
dnl Check for fully workin MMX intrinsics
dnl We need support for -mmmx, we need <mmintrin.h>, and we also need a
dnl working compiler (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=23963)
[ac_cv_c_sse2_intrinsics=no])])
if test "${ac_cv_c_sse2_intrinsics}" != "no"; then
AC_DEFINE(HAVE_SSE2_INTRINSICS, 1, Define if SSE2 intrinsics are available.)
- dnl VLC_ADD_CFLAGS([i420_rgb_sse2],[-msse2])
+ VLC_ADD_CFLAGS([i420_rgb_sse2],[-msse2])
fi
AC_CACHE_CHECK([if \$CC groks MMX inline assembly],
fi
AC_ARG_ENABLE(switcher,
- [ --enable-switcher Stream-out switcher plugin (default disabled)])
+ [ --enable-switcher Stream-out switcher plugin (default disabled)])
dnl Check for libshout
AC_ARG_ENABLE(shout,
PKG_CHECK_MODULES(SWSCALE, libswscale,[
VLC_ADD_CFLAGS([ffmpeg],[${SWSCALE_CFLAGS}])
VLC_ADD_LDFLAGS([ffmpeg],[${SWSCALE_LIBS}])
- AC_CHECK_HEADERS(ffmpeg/swscale.h)
+ AC_CHECK_LIB(swscale, sws_getContext,
+ [AC_CHECK_HEADERS(ffmpeg/swscale.h)],[])
],[ true ])
VLC_RESTORE_FLAGS
],[
dnl skins2 module
dnl
AC_ARG_ENABLE(libtar,
- [ --enable libtar support for skins2 (default enabled)])
+ [ --enable-libtar support for skins2 (default enabled)])
AS_IF([test "${enable_libtar}" != "no"],[
AC_CHECK_HEADERS(libtar.h, [
] )
])
-
dnl
dnl A52/AC3 decoder plugin
dnl
])
])
-dnl Workaround for cross-compiling since AM_PATH_LIBGRYPT doesn't dectect
-dnl it and looks for libgcrypt headers in the wrong place.
-if test "${host_cpu}" = "${build_cpu}"
+dnl
+dnl libgcrypt
+dnl
+AC_ARG_ENABLE(libgcrypt,
+ [ --enable-libgcrypt libgcrypts support (default enabled)])
+if test "${enable_libgcrypt}" != "no" -a "${enable_gnutls}" != "no"i
then
- AM_PATH_LIBGCRYPT([1:1.1.94], [have_libgcrypt="yes"], [have_libgcrypt="no"])
-else
- AC_CHECK_HEADERS(gcrypt.h,have_libgcrypt="yes",have_libgcrypt="no")
+ dnl Workaround for cross-compiling since AM_PATH_LIBGRYPT doesn't dectect
+ dnl it and looks for libgcrypt headers in the wrong place.
+ if test "${host_cpu}" = "${build_cpu}"
+ then
+ AM_PATH_LIBGCRYPT([1:1.1.94], [have_libgcrypt="yes"], [have_libgcrypt="no"])
+ else
+ AC_CHECK_HEADERS(gcrypt.h,have_libgcrypt="yes",have_libgcrypt="no")
+ fi
fi
AM_CONDITIONAL([HAVE_LIBGCRYPT], [test "${have_libgcrypt}" = "yes"])
projects / vlc / blobdiff