[vlc-commits] nacl: Add new system type
Julian Scheel
git at videolan.org
Tue Mar 28 15:39:44 CEST 2017
vlc | branch: master | Julian Scheel <julian at jusst.de> | Wed Mar 22 09:58:52 2017 +0100| [b4c4c5bee9f7b8bea0ddd9c218cbb047af62aaf3] | committer: Jean-Baptiste Kempf
nacl: Add new system type
Add system type for Google Native Client.
Signed-off-by: Julian Scheel <julian at jusst.de>
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b4c4c5bee9f7b8bea0ddd9c218cbb047af62aaf3
---
configure.ac | 6 ++++++
src/Makefile.am | 11 +++++++++++
2 files changed, 17 insertions(+)
diff --git a/configure.ac b/configure.ac
index 9042e59..32e94f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -297,6 +297,10 @@ case "${host_os}" in
AC_LIBOBJ([freeaddrinfo])
AC_LIBOBJ([gai_strerror])
;;
+ *nacl*)
+ SYS=nacl
+ AC_DEFINE([_XOPEN_SOURCE], [700], [POSIX and XPG 7th edition])
+ ;;
*)
SYS="${host_os}"
;;
@@ -328,6 +332,8 @@ AM_CONDITIONAL(HAVE_IOS, test "${HAVE_IOS}" = "1")
AM_CONDITIONAL(HAVE_OSX, test "${HAVE_OSX}" = "1")
AM_CONDITIONAL(HAVE_TVOS, test "${HAVE_TVOS}" = "1")
+AM_CONDITIONAL(HAVE_NACL, test "${SYS}" = "nacl")
+
AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32")
AM_CONDITIONAL(HAVE_WIN64, test "${HAVE_WIN64}" = "1") dnl Only used for the packaging
AM_CONDITIONAL([HAVE_WINSTORE], [test "$vlc_winstore_app" = "1"])
diff --git a/src/Makefile.am b/src/Makefile.am
index 1e0e70f..1392248 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -382,6 +382,16 @@ libvlccore_la_SOURCES += \
os2/rand.c \
os2/thread.c
else
+if HAVE_NACL
+libvlccore_la_SOURCES += \
+ android/error.c \
+ posix/dirs.c \
+ posix/filesystem.c \
+ posix/netconf.c \
+ posix/rand.c \
+ posix/specific.c \
+ posix/timer.c
+else
libvlccore_la_SOURCES += \
posix/filesystem.c \
posix/plugin.c \
@@ -425,6 +435,7 @@ endif
endif
endif
endif
+endif
if BUILD_HTTPD
libvlccore_la_SOURCES += network/httpd.c
More information about the vlc-commits
mailing list