*mingw32* | *cygwin* | *wince* | *mingwce*)
AC_CHECK_TOOL(WINDRES, windres, :)
AC_CHECK_TOOL(OBJCOPY, objcopy, :)
- AH_TOP([#if defined(WIN32) && !defined(_WIN32_WINNT)])
+ AH_TOP([#if defined(_WIN32) && !defined(_WIN32_WINNT)])
AH_TOP([# define _WIN32_WINNT 0x0502 /* Windows XP SP2 */])
AH_TOP([#endif])
AC_DEFINE([_WIN32_IE], 0x0600, [Define to '0x0600' for IE 6.0 (and shell) APIs.])
dnl Check if we are using the mno-cygwin mode in which case we are
dnl actually dealing with a mingw32 compiler.
AC_EGREP_CPP(yes,
- [#ifdef WIN32
+ [#ifdef _WIN32
yes
#endif],
SYS=mingw32, AC_MSG_ERROR([VLC requires -mno-cygwin]))
esac
if test "${SYS}" = "mingw32"; then
+ # DEP, ASLR, NO SEH
+ LDFLAGS="${LDFLAGS} -Wl,--nxcompat -Wl,--no-seh -Wl,--dynamicbase"
+
VLC_ADD_LIBS([libvlccore],[-lwinmm])
VLC_ADD_LDFLAGS([vlc],[-mwindows])
VLC_ADD_LIBS([win32text],[-lgdi32])
dnl
dnl Gettext stuff
dnl
-AM_GNU_GETTEXT_VERSION([0.18.1])
+AM_GNU_GETTEXT_VERSION([0.18.2])
AM_GNU_GETTEXT([external], [need-ngettext])
dnl
[#include <sys/types.h>
#if HAVE_POLL
# include <poll.h>
-#elif defined (WIN32)
+#elif defined (_WIN32)
# include <winsock2.h>
#endif
])
LIBS="${LIBS} ${SOCKET_LIBS}"
AC_LINK_IFELSE([
- AC_LANG_PROGRAM([#ifdef WIN32
+ AC_LANG_PROGRAM([#ifdef _WIN32
# if _WIN32_WINNT < 0x600
# error Needs vista+
# endif
ac_cv_type_socklen_t,
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
[#include <sys/types.h>
-#ifdef WIN32
+#ifdef _WIN32
# include <winsock2.h>
# include <ws2tcpip.h>
#else
AC_CACHE_CHECK([for struct sockaddr_storage], ac_cv_struct_sockaddr_storage,
[AC_TRY_COMPILE(
[#include <sys/types.h>
- #if defined( WIN32 )
+ #if defined( _WIN32 )
# include <winsock2.h>
#else
# include <sys/socket.h>
AC_SUBST(GNUGETOPT_LIBS)
AC_CHECK_LIB(m,cos,[
- VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom panoramix rotate noise grain scene kate lua chorus_flanger freetype avcodec access_avio swscale postproc i420_rgb faad twolame equalizer spatializer param_eq samplerate freetype mpc dmo quicktime qt4 compressor headphone_channel_mixer normvol audiobargraph_a speex opus mono colorthres extract ball access_imem hotkeys mosaic gaussianblur x26410b hqdn3d anaglyph oldrc ncurses],[-lm])
+ VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom panoramix rotate noise grain scene kate lua chorus_flanger freetype avcodec access_avio swscale postproc i420_rgb faad twolame equalizer spatializer param_eq samplerate freetype mpc dmo quicktime qt4 compressor headphone_channel_mixer normvol audiobargraph_a audiobargraph_v speex opus mono colorthres extract ball access_imem hotkeys mosaic gaussianblur x26410b hqdn3d anaglyph oldrc ncurses],[-lm])
LIBM="-lm"
], [
LIBM=""
[enable RTSP input through live555 (default enabled)])])
AS_IF([test "${enable_live555}" != "no" -a -n "${CXX}"], [
- AC_LANG_PUSH(C++)
- VLC_SAVE_FLAGS
-
- dnl detect include paths
- AS_IF([test -f "${CONTRIB_DIR}/include/UsageEnvironment.hh"], [
- CPPFLAGS_live555="-I${CONTRIB_DIR}/include/liveMedia -I${CONTRIB_DIR}/include/groupsock -I${CONTRIB_DIR}/include/BasicUsageEnvironment -I${CONTRIB_DIR}/include/UsageEnvironment"
+ PKG_CHECK_MODULES(LIVE555, live555, [
+ VLC_ADD_PLUGIN([live555])
+ VLC_ADD_CXXFLAGS([live555], [$LIVE555_CFLAGS])
+ VLC_ADD_LIBS([live555],[$LIVE555_LIBS])
], [
- AS_IF([test ${SYS} != "os2"], [
- LIVE555_PREFIX=${LIVE555_PREFIX-"/usr"}
- CPPFLAGS_live555="-I${LIVE555_PREFIX}/include/liveMedia -I${LIVE555_PREFIX}/include/groupsock -I${LIVE555_PREFIX}/include/BasicUsageEnvironment -I${LIVE555_PREFIX}/include/UsageEnvironment"
+ AC_MSG_WARN([${LIVE555_PKG_ERRORS}.])
+
+ AC_LANG_PUSH(C++)
+ VLC_SAVE_FLAGS
+
+ dnl detect include paths
+ AS_IF([test -f "${CONTRIB_DIR}/include/UsageEnvironment.hh"], [
+ CPPFLAGS_live555="-I${CONTRIB_DIR}/include/liveMedia -I${CONTRIB_DIR}/include/groupsock -I${CONTRIB_DIR}/include/BasicUsageEnvironment -I${CONTRIB_DIR}/include/UsageEnvironment"
], [
- LIVE555_PREFIX=${LIVE555_PREFIX-"/usr/lib/live"}
- CPPFLAGS_live555="-I${LIVE555_PREFIX}/liveMedia/include -I${LIVE555_PREFIX}/groupsock/include -I${LIVE555_PREFIX}/BasicUsageEnvironment/include -I${LIVE555_PREFIX}/UsageEnvironment/include"
- LDFLAGS_live555="-L${LIVE555_PREFIX}/liveMedia -L${LIVE555_PREFIX}/groupsock -L${LIVE555_PREFIX}/BasicUsageEnvironment -L${LIVE555_PREFIX}/UsageEnvironment"
+ AS_IF([test "${SYS}" != "os2"], [
+ LIVE555_PREFIX=${LIVE555_PREFIX-"/usr"}
+ CPPFLAGS_live555="-I${LIVE555_PREFIX}/include/liveMedia -I${LIVE555_PREFIX}/include/groupsock -I${LIVE555_PREFIX}/include/BasicUsageEnvironment -I${LIVE555_PREFIX}/include/UsageEnvironment"
+ ], [
+ LIVE555_PREFIX=${LIVE555_PREFIX-"/usr/lib/live"}
+ CPPFLAGS_live555="-I${LIVE555_PREFIX}/liveMedia/include -I${LIVE555_PREFIX}/groupsock/include -I${LIVE555_PREFIX}/BasicUsageEnvironment/include -I${LIVE555_PREFIX}/UsageEnvironment/include"
+ LDFLAGS_live555="-L${LIVE555_PREFIX}/liveMedia -L${LIVE555_PREFIX}/groupsock -L${LIVE555_PREFIX}/BasicUsageEnvironment -L${LIVE555_PREFIX}/UsageEnvironment"
+ ])
])
- ])
- dnl CPP Flags
- AS_IF([test "${SYS}" = "solaris"], [
- CPPFLAGS_live555="${CPPFLAGS_live555} -DSOLARIS"
- ])
- CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_live555}"
- LDFLAGS="${LDFLAGS} ${LDFLAGS_live555}"
+ dnl CPP Flags
+ AS_IF([test "${SYS}" = "solaris"], [
+ CPPFLAGS_live555="${CPPFLAGS_live555} -DSOLARIS"
+ ])
+ CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_live555}"
+ LDFLAGS="${LDFLAGS} ${LDFLAGS_live555}"
- dnl version check
- AC_CACHE_CHECK([for live555 version 1324598400 or later], [ac_cv_live555], [
- AC_PREPROC_IFELSE([AC_LANG_PROGRAM([
+ dnl version check
+ AC_CACHE_CHECK([for live555 version 1324598400 or later], [ac_cv_live555], [
+ AC_PREPROC_IFELSE([AC_LANG_PROGRAM([
[#include <liveMedia_version.hh>
#if !defined (LIVEMEDIA_LIBRARY_VERSION_INT) || (LIVEMEDIA_LIBRARY_VERSION_INT < 1324598400)
# error BOOM
#endif]])
- ], [
- ac_cv_live555="yes"
- ], [
- ac_cv_live555="no"
+ ], [
+ ac_cv_live555="yes"
+ ], [
+ ac_cv_live555="no"
+ ])
])
- ])
- AS_IF([test "$ac_cv_live555" = "no"], [
- AC_MSG_WARN([liveMedia is missing or its installed version is too old:
+ AS_IF([test "$ac_cv_live555" = "no"], [
+ AC_MSG_WARN([live555 is missing or its installed version is too old:
Version 2011.12.23 or later is required to proceed.
You can get an updated one from http://www.live555.com/liveMedia .])
- AS_IF([test -n "${enable_live555}"], [
- AC_MSG_ERROR([Update live555 or pass --disable-live555 to disable RTSP input support.])
- ])
- ], [
- other_libs="-lgroupsock -lBasicUsageEnvironment -lUsageEnvironment"
- other_libs_pic="-lgroupsock_pic -lBasicUsageEnvironment_pic -lUsageEnvironment_pic"
- AS_IF([test "${SYS}" = "mingw32"], [
- # add ws2_32 for closesocket, select, recv
- other_libs="$other_libs -lws2_32"
- ])
+ AS_IF([test -n "${enable_live555}"], [
+ AC_MSG_ERROR([Update live555 or pass --disable-live555 to disable RTSP input support.])
+ ])
+ ], [
+ other_libs="-lgroupsock -lBasicUsageEnvironment -lUsageEnvironment"
+ other_libs_pic="-lgroupsock_pic -lBasicUsageEnvironment_pic -lUsageEnvironment_pic"
+ AS_IF([test "${SYS}" = "mingw32"], [
+ # add ws2_32 for closesocket, select, recv
+ other_libs="$other_libs -lws2_32"
+ ])
- dnl We need to check for pic because live555 don't provide shared libs
- dnl and we want to build a plugins so we need -fPIC on some arch.
- VLC_ADD_CXXFLAGS([live555], [${CPPFLAGS_live555}])
- VLC_ADD_LDFLAGS([live555], [${LDFLAGS_live555}])
- AC_CHECK_LIB(liveMedia_pic, main, [
- VLC_ADD_PLUGIN([live555])
- VLC_ADD_LIBS([live555], [-lliveMedia_pic ${other_libs_pic}])
- ],[
- AC_CHECK_LIB(liveMedia, main, [
+ dnl We need to check for pic because live555 don't provide shared libs
+ dnl and we want to build a plugins so we need -fPIC on some arch.
+ VLC_ADD_CXXFLAGS([live555], [${CPPFLAGS_live555}])
+ VLC_ADD_LDFLAGS([live555], [${LDFLAGS_live555}])
+ AC_CHECK_LIB(liveMedia_pic, main, [
VLC_ADD_PLUGIN([live555])
- VLC_ADD_LIBS([live555], [-lliveMedia ${other_libs}])
- ],[],[${other_libs}])],[${other_libs_pic}])
+ VLC_ADD_LIBS([live555], [-lliveMedia_pic ${other_libs_pic}])
+ ],[
+ AC_CHECK_LIB(liveMedia, main, [
+ VLC_ADD_PLUGIN([live555])
+ VLC_ADD_LIBS([live555], [-lliveMedia ${other_libs}])
+ ],[],[${other_libs}])
+ ],[${other_libs_pic}])
+ ])
+ VLC_RESTORE_FLAGS
+ AC_LANG_POP(C++)
])
- VLC_RESTORE_FLAGS
- AC_LANG_POP(C++)
])
dnl
LIBS="${SAVED_LIBS}"
if test "${have_avfoundation}" != "no"
then
- VLC_ADD_LIBS([macosx],[-Wl,-framework,AVFoundation])
VLC_ADD_PLUGIN([avcapture])
fi
fi
fi
fi
+dnl
+dnl Intel QuickSync (aka MediaSDK) H264/H262 encoder
+dnl
+PKG_ENABLE_MODULES_VLC([QUICKSYNC], [qsv], [libmfx], [Intel QuickSync MPEG4-Part10/MPEG2 (aka H.264/H.262) encoder], [auto])
+
dnl
dnl libfluidsynth (MIDI synthetizer) plugin
dnl
], [test "${SYS}" = "darwin"], [
VLC_ADD_CPPFLAGS([skins2],[ -DMACOSX_SKINS])
VLC_ADD_LIBS([skins2],[-Wl,-framework,Carbon])
+ dnl OS/2
+ ], [test "${SYS}" = "os2"], [
+ VLC_ADD_CPPFLAGS([skins2],[ -DOS2_SKINS])
dnl Linux/Unix
], [
PKG_CHECK_MODULES([XPM], [xpm],, [have_skins_deps="no"])
projects / vlc / blobdiff