diff options
| author | Nicolas Dufresne <nicolas.dufresne@collabora.com> | 2016-07-06 11:32:55 -0400 |
|---|---|---|
| committer | Arun Raghavan <arun@arunraghavan.net> | 2016-07-14 12:57:43 +0900 |
| commit | c9cffb9e3d632b61465afbca5d10c36512888035 (patch) | |
| tree | af376ce7b522b381f7fe772911652d4e207335fa | |
| parent | 1378babdf0f56938408d8137595023efe1bd7c2d (diff) | |
build: Sync defines and libs with build.gn
| -rw-r--r-- | configure.ac | 13 | ||||
| -rw-r--r-- | webrtc/modules/audio_processing/Makefile.am | 2 |
2 files changed, 10 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 41d521c..bdefd72 100644 --- a/configure.ac +++ b/configure.ac @@ -51,26 +51,29 @@ AC_CHECK_HEADER(MobileCoreServices/MobileCoreServices.h, HAVE_IOS="yes", HAVE_IO AS_CASE(["${host}"], [*android*], [ - OS_CFLAGS="-DWEBRTC_ANDROID -DWEBRTC_LINUX" + OS_CFLAGS="-DWEBRTC_ANDROID -DWEBRTC_LINUX -DWEBRTC_THREAD_RR -DWEBRTC_CLOCK_TYPE_REALTIME" + OS_LDFLAGS="-llog" PLATFORM_CFLAGS="-DWEBRTC_POSIX" HAVE_POSIX=1 ], [*-*linux*], [ - OS_CFLAGS="-DWEBRTC_LINUX" + OS_CFLAGS="-DWEBRTC_LINUX -DWEBRTC_THREAD_RR" PLATFORM_CFLAGS="-DWEBRTC_POSIX" + OS_LDFLAGS="-lrt" HAVE_POSIX=1 ], [*-*darwin*], [ + OS_CFLAGS="-DWEBRTC_MAC -DWEBRTC_THREAD_RR -DWEBRTC_CLOCK_TYPE_REALTIME" AS_IF([test "$HAVE_IOS" = "yes"], - [OS_CFLAGS="-DWEBRTC_MAC -DWEBRTC_IOS"], - [OS_CFLAGS="-DWEBRTC_MAC"]) + [OS_CFLAGS+=" -DWEBRTC_IOS"]) PLATFORM_CFLAGS="-DWEBRTC_POSIX" HAVE_POSIX=1 ], [*-mingw32*], [ + OS_LDFLAGS="-lwinmm" PLATFORM_CFLAGS="-DWEBRTC_WIN -D_WIN32 -U__STRICT_ANSI__" HAVE_WIN=1 ], @@ -131,8 +134,10 @@ AM_CONDITIONAL([HAVE_NEON], [test "x$HAVE_NEON" = "x1"]) COMMON_CFLAGS="-DWEBRTC_AUDIO_PROCESSING_ONLY_BUILD ${PLATFORM_CFLAGS} ${OS_CFLAGS} ${ARCH_CFLAGS} -DNDEBUG -I\$(top_srcdir)" COMMON_CXXFLAGS="-std=c++11 -DWEBRTC_AUDIO_PROCESSING_ONLY_BUILD ${PLATFORM_CFLAGS} ${OS_CFLAGS} ${ARCH_CFLAGS} ${GNUSTL_CFLAGS} -DNDEBUG -I\$(top_srcdir)" +COMMON_LDFLAGS="${OS_LDFLAGS}" AC_SUBST([COMMON_CFLAGS]) AC_SUBST([COMMON_CXXFLAGS]) +AC_SUBST([COMMON_LDFLAGS]) AC_CONFIG_FILES([ webrtc-audio-processing.pc diff --git a/webrtc/modules/audio_processing/Makefile.am b/webrtc/modules/audio_processing/Makefile.am index 8e45e3d..de259f0 100644 --- a/webrtc/modules/audio_processing/Makefile.am +++ b/webrtc/modules/audio_processing/Makefile.am @@ -174,7 +174,7 @@ libwebrtc_audio_processing_la_LIBADD = $(top_builddir)/webrtc/libwebrtc.la \ $(top_builddir)/webrtc/modules/audio_coding/libaudio_coding.la \ $(LIBWEBRTC_PRIVATEARCH) \ $(GNUSTL_LIBS) -libwebrtc_audio_processing_la_LDFLAGS = $(AM_LDFLAGS) \ +libwebrtc_audio_processing_la_LDFLAGS = $(AM_LDFLAGS) $(COMMON_LDFLAGS) \ -Wl,--no-undefined \ -version-info $(LIBWEBRTC_AUDIO_PROCESSING_VERSION_INFO) |