Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
8a1afb86
Commit
8a1afb86
authored
Apr 30, 2011
by
Rémi Duraffort
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add an automate variable to detect Android builb and use it to forbid build of
access_dtv for Android systems.
parent
361edf82
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
1 deletion
+9
-1
configure.ac
configure.ac
+7
-1
modules/access/Modules.am
modules/access/Modules.am
+2
-0
No files found.
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
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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