ARCH_flag="-arch x86_64"
;;
arm*)
- ARCH_flag="-arch armv7"
ac_cv_c_bigendian="no"
ac_cv_c_attribute_packed="no"
;;
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
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"
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
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])
+ VLC_ADD_LIBS([auhal],[-Wl,-framework,CoreAudio,-framework,AudioUnit,-framework,AudioToolbox,-framework,CoreServices])
], [ AC_MSG_ERROR([cannot find CoreAudio headers]) ])
fi
])
])
-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
])
])