|
 |
14ed36 |
From c9cffb9e3d632b61465afbca5d10c36512888035 Mon Sep 17 00:00:00 2001
|
|
|
14ed36 |
From: Nicolas Dufresne <nicolas.dufresne@collabora.com>
|
|
|
14ed36 |
Date: Wed, 6 Jul 2016 11:32:55 -0400
|
|
|
14ed36 |
Subject: [PATCH 10/16] build: Sync defines and libs with build.gn
|
|
|
14ed36 |
|
|
|
14ed36 |
---
|
|
|
14ed36 |
configure.ac | 13 +++++++++----
|
|
|
14ed36 |
webrtc/modules/audio_processing/Makefile.am | 2 +-
|
|
|
14ed36 |
2 files changed, 10 insertions(+), 5 deletions(-)
|
|
|
14ed36 |
|
|
|
14ed36 |
diff --git a/configure.ac b/configure.ac
|
|
|
14ed36 |
index 41d521c..bdefd72 100644
|
|
|
14ed36 |
--- a/configure.ac
|
|
|
14ed36 |
+++ b/configure.ac
|
|
|
14ed36 |
@@ -51,26 +51,29 @@ AC_CHECK_HEADER(MobileCoreServices/MobileCoreServices.h, HAVE_IOS="yes", HAVE_IO
|
|
|
14ed36 |
AS_CASE(["${host}"],
|
|
|
14ed36 |
[*android*],
|
|
|
14ed36 |
[
|
|
|
14ed36 |
- OS_CFLAGS="-DWEBRTC_ANDROID -DWEBRTC_LINUX"
|
|
|
14ed36 |
+ OS_CFLAGS="-DWEBRTC_ANDROID -DWEBRTC_LINUX -DWEBRTC_THREAD_RR -DWEBRTC_CLOCK_TYPE_REALTIME"
|
|
|
14ed36 |
+ OS_LDFLAGS="-llog"
|
|
|
14ed36 |
PLATFORM_CFLAGS="-DWEBRTC_POSIX"
|
|
|
14ed36 |
HAVE_POSIX=1
|
|
|
14ed36 |
],
|
|
|
14ed36 |
[*-*linux*],
|
|
|
14ed36 |
[
|
|
|
14ed36 |
- OS_CFLAGS="-DWEBRTC_LINUX"
|
|
|
14ed36 |
+ OS_CFLAGS="-DWEBRTC_LINUX -DWEBRTC_THREAD_RR"
|
|
|
14ed36 |
PLATFORM_CFLAGS="-DWEBRTC_POSIX"
|
|
|
14ed36 |
+ OS_LDFLAGS="-lrt"
|
|
|
14ed36 |
HAVE_POSIX=1
|
|
|
14ed36 |
],
|
|
|
14ed36 |
[*-*darwin*],
|
|
|
14ed36 |
[
|
|
|
14ed36 |
+ OS_CFLAGS="-DWEBRTC_MAC -DWEBRTC_THREAD_RR -DWEBRTC_CLOCK_TYPE_REALTIME"
|
|
|
14ed36 |
AS_IF([test "$HAVE_IOS" = "yes"],
|
|
|
14ed36 |
- [OS_CFLAGS="-DWEBRTC_MAC -DWEBRTC_IOS"],
|
|
|
14ed36 |
- [OS_CFLAGS="-DWEBRTC_MAC"])
|
|
|
14ed36 |
+ [OS_CFLAGS+=" -DWEBRTC_IOS"])
|
|
|
14ed36 |
PLATFORM_CFLAGS="-DWEBRTC_POSIX"
|
|
|
14ed36 |
HAVE_POSIX=1
|
|
|
14ed36 |
],
|
|
|
14ed36 |
[*-mingw32*],
|
|
|
14ed36 |
[
|
|
|
14ed36 |
+ OS_LDFLAGS="-lwinmm"
|
|
|
14ed36 |
PLATFORM_CFLAGS="-DWEBRTC_WIN -D_WIN32 -U__STRICT_ANSI__"
|
|
|
14ed36 |
HAVE_WIN=1
|
|
|
14ed36 |
],
|
|
|
14ed36 |
@@ -131,8 +134,10 @@ AM_CONDITIONAL([HAVE_NEON], [test "x$HAVE_NEON" = "x1"])
|
|
|
14ed36 |
|
|
|
14ed36 |
COMMON_CFLAGS="-DWEBRTC_AUDIO_PROCESSING_ONLY_BUILD ${PLATFORM_CFLAGS} ${OS_CFLAGS} ${ARCH_CFLAGS} -DNDEBUG -I\$(top_srcdir)"
|
|
|
14ed36 |
COMMON_CXXFLAGS="-std=c++11 -DWEBRTC_AUDIO_PROCESSING_ONLY_BUILD ${PLATFORM_CFLAGS} ${OS_CFLAGS} ${ARCH_CFLAGS} ${GNUSTL_CFLAGS} -DNDEBUG -I\$(top_srcdir)"
|
|
|
14ed36 |
+COMMON_LDFLAGS="${OS_LDFLAGS}"
|
|
|
14ed36 |
AC_SUBST([COMMON_CFLAGS])
|
|
|
14ed36 |
AC_SUBST([COMMON_CXXFLAGS])
|
|
|
14ed36 |
+AC_SUBST([COMMON_LDFLAGS])
|
|
|
14ed36 |
|
|
|
14ed36 |
AC_CONFIG_FILES([
|
|
|
14ed36 |
webrtc-audio-processing.pc
|
|
|
14ed36 |
diff --git a/webrtc/modules/audio_processing/Makefile.am b/webrtc/modules/audio_processing/Makefile.am
|
|
|
14ed36 |
index 8e45e3d..de259f0 100644
|
|
|
14ed36 |
--- a/webrtc/modules/audio_processing/Makefile.am
|
|
|
14ed36 |
+++ b/webrtc/modules/audio_processing/Makefile.am
|
|
|
14ed36 |
@@ -174,7 +174,7 @@ libwebrtc_audio_processing_la_LIBADD = $(top_builddir)/webrtc/libwebrtc.la \
|
|
|
14ed36 |
$(top_builddir)/webrtc/modules/audio_coding/libaudio_coding.la \
|
|
|
14ed36 |
$(LIBWEBRTC_PRIVATEARCH) \
|
|
|
14ed36 |
$(GNUSTL_LIBS)
|
|
|
14ed36 |
-libwebrtc_audio_processing_la_LDFLAGS = $(AM_LDFLAGS) \
|
|
|
14ed36 |
+libwebrtc_audio_processing_la_LDFLAGS = $(AM_LDFLAGS) $(COMMON_LDFLAGS) \
|
|
|
14ed36 |
-Wl,--no-undefined \
|
|
|
14ed36 |
-version-info $(LIBWEBRTC_AUDIO_PROCESSING_VERSION_INFO)
|
|
|
14ed36 |
|
|
|
14ed36 |
--
|
|
|
14ed36 |
2.14.3
|
|
|
14ed36 |
|