Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
8a1afb86
Commit
8a1afb86
authored
Apr 30, 2011
by
ivoire
Browse files
Add an automate variable to detect Android builb and use it to forbid build of
access_dtv for Android systems.
parent
361edf82
Changes
2
Hide whitespace changes
Inline
Side-by-side
configure.ac
View file @
8a1afb86
...
...
@@ -171,6 +171,7 @@ LDFLAGS_vlc="${LDFLAGS}"
dnl
dnl Check the operating system
dnl
HAVE_ANDROID="0"
HAVE_WIN64="0"
case "${host_os}" in
"")
...
...
@@ -178,6 +179,10 @@ case "${host_os}" in
;;
linux*)
SYS=linux
AC_TRY_COMPILE([],[#ifndef __ANDROID__
# error "Not compiling for Android"
#endif],
[HAVE_ANDROID="1"])
;;
bsdi*)
SYS=bsdi
...
...
@@ -393,13 +398,14 @@ case "${host_os}" in
SYS="${host_os}"
;;
esac
AM_CONDITIONAL(HAVE_ANDROID, test "${HAVE_ANDROID}" = "1")
AM_CONDITIONAL(HAVE_DARWIN, test "${SYS}" = "darwin")
AM_CONDITIONAL(HAVE_LINUX, test "${SYS}" = "linux")
AM_CONDITIONAL(HAVE_OS2, test "${SYS}" = "os2")
AM_CONDITIONAL(HAVE_SYMBIAN, test "${SYS}" = "symbian")
AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32")
AM_CONDITIONAL(HAVE_WIN64, test "${HAVE_WIN64}" = "1")
AM_CONDITIONAL(HAVE_WINCE, test "${SYS}" = "mingwce")
AM_CONDITIONAL(HAVE_SYMBIAN, test "${SYS}" = "symbian")
AM_CONDITIONAL(USE_PEFLAGS, test "${enable_peflags}" = "yes")
dnl
...
...
modules/access/Modules.am
View file @
8a1afb86
...
...
@@ -128,9 +128,11 @@ libdtv_plugin_la_LIBADD = $(AM_LIBADD)
libdtv_plugin_la_DEPENDENCIES =
if HAVE_LINUX
if !HAVE_ANDROID
libdtv_plugin_la_SOURCES += dtv/linux.c
libvlc_LTLIBRARIES += libdtv_plugin.la
endif
endif
if HAVE_WIN32
# Work-around automake bug:
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment