ARCH_flag="-arch x86_64"
;;
arm*)
- ARCH_flag="-arch armv7"
ac_cv_c_bigendian="no"
ac_cv_c_attribute_packed="no"
;;
*mingw32* | *cygwin* | *wince* | *mingwce*)
AC_CHECK_TOOL(WINDRES, windres, :)
AC_CHECK_TOOL(OBJCOPY, objcopy, :)
- AC_DEFINE([_WIN32_WINNT], 0x0502, [Define to '0x0502' for Windows XP SP2 APIs.])
+ 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.])
+ AC_DEFINE([_UNICODE], [1], [Define to 1 for Unicode (Wide Chars) APIs.])
+ AC_DEFINE([UNICODE], [1], [Define to 1 for Unicode (Wide Chars) APIs.])
case "${host_os}" in
*mingw32*)
DESTDIR="`pwd`/_win32/"
dnl
- dnl NSIS Installer prefix and WIN64
+ dnl NSIS/MSI Installer prefix and WIN64
dnl
case "${host}" in
amd64*|x86_64*)
HAVE_WIN64="1"
+ WINDOWS_ARCH="x64"
PROGRAMFILES="PROGRAMFILES64"
;;
*)
+ WINDOWS_ARCH="x86"
PROGRAMFILES="PROGRAMFILES"
;;
esac
+ AC_SUBST(WINDOWS_ARCH)
AC_SUBST(PROGRAMFILES)
fi
fi
])
+AC_ARG_ENABLE(winstore_app,
+ AS_HELP_STRING([--enable-winstore-app],
+ [Build targetted for Windows Store apps (default disabled)]))
+
+AS_IF([test "${SYS}" = "mingw32"], [
+ AS_IF([test "${enable_winstore_app}" == "yes"], [
+ AC_DEFINE(WINAPI_FAMILY_APP, 1, [Define if you want to build for Windows Store apps])])
+ ])
+
+
dnl
dnl Buggy glibc prevention. Purposedly not cached.
dnl See sourceware.org bugs 5058 and 5443.
dnl Check for usual libc functions
AC_CHECK_DECLS([nanosleep],,,[#include <time.h>])
AC_CHECK_FUNCS([daemon fcntl fstatvfs fork getenv getpwuid_r isatty lstat memalign mmap openat pread posix_fadvise posix_madvise setlocale stricmp strnicmp strptime uselocale])
-AC_REPLACE_FUNCS([atof atoll dirfd fdopendir flockfile fsync getdelim getpid gmtime_r inet_pton lldiv localtime_r nrand48 poll posix_memalign rewind setenv strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab tdestroy strverscmp])
+AC_REPLACE_FUNCS([atof atoll dirfd fdopendir flockfile fsync getdelim getpid gmtime_r inet_pton lldiv localtime_r nrand48 poll posix_memalign rewind setenv strcasecmp strcasestr strdup strlcpy strndup strnlen strsep strtof strtok_r strtoll swab tdestroy strverscmp])
AC_CHECK_FUNCS(fdatasync,,
[AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.])
])
LDFLAGS="-lgcov ${LDFLAGS}"
])
-AS_IF([test "${SYS}" != "mingw32"], [
+AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "os2"], [
VLC_SAVE_FLAGS
CFLAGS="${CFLAGS} -fvisibility=hidden"
CXXFLAGS="${CXXFLAGS} -fvisibility=hidden"
AS_IF([test "${LUAC}" = "false"], [
AC_MSG_ERROR([Could not find the LUA byte compiler.])
])
+ AS_IF([test -f ${CONTRIB_DIR}/lib/liblua.a -a `echo|${LUAC} -o - -|od -j 8 -N 2 -t x2|head -n 1|cut -d' ' -f2` != 0404], [
+ AC_MSG_ERROR([You need 32-bits luac when using using lua from contrib.])
+ ])
fi
AM_CONDITIONAL(BUILD_LUA, [test "${have_lua}" = "yes"])
dnl
dnl libsmbclient plugin
dnl
-AC_ARG_ENABLE(smb,
- [AS_HELP_STRING([--disable-smb], [disable SMB/CIFS support (default auto)])])
-if test "${enable_smb}" != "no"; then
- AC_CHECK_HEADERS(libsmbclient.h,
- [ VLC_ADD_PLUGIN([access_smb])
- VLC_ADD_LIBS([access_smb],[-lsmbclient]) ],
- [ if test -n "${enable_smb}"; then
- AC_MSG_ERROR([cannot find libsmbclient headers])
- fi ])
-fi
+PKG_ENABLE_MODULES_VLC([SMBCLIENT], [access_smb], [smbclient], (SMB/CIFS support), [auto])
dnl
then
if test "${with_decklink_sdk}" != "no" -a -n "${with_decklink_sdk}"
then
- VLC_ADD_CXXFLAGS([decklink],[-I${with_decklink_sdk}/include])
+ VLC_ADD_CPPFLAGS([decklink decklinkoutput],[-I${with_decklink_sdk}/include])
fi
VLC_SAVE_FLAGS
- CXXFLAGS="${CXXFLAGS} ${CXXFLAGS_decklink}"
+ CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_decklink}"
AC_LANG_PUSH(C++)
AC_CHECK_HEADERS(DeckLinkAPIDispatch.cpp, [
have_decklink=yes
AC_ARG_ENABLE(avcodec,
[ --enable-avcodec libavcodec codec (default enabled)])
AS_IF([test "${enable_avcodec}" != "no"], [
- PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 53.34.0 libavutil >= 51.22.0],
- [
- VLC_SAVE_FLAGS
- CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"
- CFLAGS="${CFLAGS} ${AVCODEC_CFLAGS}"
- AC_CHECK_HEADERS(libavcodec/avcodec.h)
- AC_CHECK_HEADERS(libavutil/avutil.h)
- VLC_ADD_PLUGIN([avcodec])
- VLC_ADD_LIBS([avcodec],[$AVCODEC_LIBS])
- AS_IF([test "${ac_cv_ld_bsymbolic}" != "no"], [
- VLC_ADD_LIBS([avcodec],[-Wl,-Bsymbolic])
- ])
- VLC_ADD_CFLAGS([avcodec],[$AVCODEC_CFLAGS])
- VLC_RESTORE_FLAGS
- have_avcodec="yes"
- ],[
- AC_MSG_ERROR([${AVCODEC_PKG_ERRORS}. Pass --disable-avcodec to ignore this error.])
+ PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 53.34.0 libavutil >= 51.22.0], [
+ PKG_CHECK_EXISTS([libavcodec < 55],, [
+ AC_MSG_ERROR([libavcodec versions 55 and later are not supported yet.])
+ ])
+ VLC_SAVE_FLAGS
+ CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"
+ CFLAGS="${CFLAGS} ${AVCODEC_CFLAGS}"
+ AC_CHECK_HEADERS(libavcodec/avcodec.h)
+ AC_CHECK_HEADERS(libavutil/avutil.h)
+ VLC_ADD_PLUGIN([avcodec])
+ VLC_ADD_LIBS([avcodec],[$AVCODEC_LIBS])
+ AS_IF([test "${ac_cv_ld_bsymbolic}" != "no"], [
+ VLC_ADD_LIBS([avcodec],[-Wl,-Bsymbolic])
+ ])
+ VLC_ADD_CFLAGS([avcodec],[$AVCODEC_CFLAGS])
+ VLC_RESTORE_FLAGS
+ have_avcodec="yes"
+ ],[
+ AC_MSG_ERROR([${AVCODEC_PKG_ERRORS}. Pass --disable-avcodec to ignore this error.])
])
], [
have_avcodec="no"
AS_IF([test "${enable_vdpau}" != "no"], [
PKG_CHECK_MODULES([VDPAU], [vdpau], [
have_vdpau="yes"
+ AS_IF([test "${no_x}" = "yes"], [
+ AC_MSG_ERROR([VDPAU requires Xlib (X11).])
+ ])
AC_MSG_NOTICE([VDPAU acceleration activated])
], [
AS_IF([test -n "${enable_vdpau}"], [
AC_MSG_ERROR([${VDPAU_PKG_ERRORS}.])
])
])
- AS_IF([test "${no_x}" = "yes"], [
- AC_MSG_ERROR([VDPAU requires Xlib (X11).])
- ])
])
dnl AM_CONDITIONAL([HAVE_VDPAU], [test "${have_vdpau}" = "yes"])
if test "${enable_ios_vout}" = "yes"
then
VLC_ADD_PLUGIN([vout_ios])
- VLC_ADD_CFLAGS([vout_ios], [-DUSE_OPENGL_ES=1])
VLC_ADD_LIBS([vout_ios], [-Wl,-framework,OpenGLES,-framework,QuartzCore,-framework,UIKit,-framework,Foundation])
fi
then
AC_CHECK_HEADERS(CoreAudio/CoreAudio.h,
[ VLC_ADD_PLUGIN([auhal])
- VLC_ADD_LIBS([auhal],[-Wl,-framework,CoreAudio,-framework,AudioUnit,-framework,AudioToolbox,-framework,Carbon])
+ VLC_ADD_LIBS([auhal],[-Wl,-framework,CoreAudio,-framework,AudioUnit,-framework,AudioToolbox,-framework,CoreServices])
], [ AC_MSG_ERROR([cannot find CoreAudio headers]) ])
fi
[ --enable-macosx Mac OS X gui support (default enabled on Mac OS X)])
if test "x${enable_macosx}" != "xno" -a "${SYS}" = "darwin"
then
- VLC_ADD_LIBS([macosx], [-Wl,-framework,Cocoa -Wl,-framework,OpenGL -Wl,-framework,Carbon -Wl,-framework,CoreServices -Wl,-framework,AGL])
+ VLC_ADD_LIBS([macosx], [-Wl,-framework,Cocoa -Wl,-framework,Carbon -Wl,-framework,CoreServices])
VLC_ADD_OBJCFLAGS([macosx], [-fobjc-exceptions] )
VLC_ADD_PLUGIN([macosx])
- VLC_ADD_LIBS([macosx], [-Wl,-framework,QTKit -Wl,-framework,IOKit -Wl,-framework,AddressBook -Wl,-framework,WebKit -Wl,-framework,CoreAudio -Wl,-framework,SystemConfiguration])
+ VLC_ADD_LIBS([macosx], [-Wl,-framework,QTKit -Wl,-framework,IOKit -Wl,-framework,AddressBook -Wl,-framework,WebKit -Wl,-framework,CoreAudio -Wl,-framework,SystemConfiguration -Wl,-framework,ScriptingBridge])
if test ! -d ${CONTRIB_DIR}/Sparkle.framework
then
])
])
-AC_ARG_ENABLE(osdmenu,
- AS_HELP_STRING([--enable-osdmenu],[OSD menu (default disabled)]),, [
- enable_osdmenu="no"
-])
-AM_CONDITIONAL(BUILD_OSDMENU, [test "${enable_osdmenu}" != "no"])
-
EXTEND_HELP_STRING([Service Discovery plugins:])
dnl
])
-dnl
-dnl Nokia MCE plugin (Maemo screen unblanking)
-dnl
-PKG_CHECK_MODULES([MCE], [dbus-1 mce], [VLC_ADD_PLUGIN([mce])], [true])
-
-
-AS_IF([test -f "/etc/maemo_version"], [
- AC_DEFINE([HAVE_MAEMO], 1, [Define to 1 if building for the Maemo platform.])
-])
-
-
dnl
dnl Taglib plugin
dnl
AC_CONFIG_FILES([
extras/package/win32/NSIS/spad.nsi
extras/package/win32/NSIS/vlc.win32.nsi
+ extras/package/win32/msi/config.wxi
])
])