Commit c9cffb9e authored by Nicolas Dufresne's avatar Nicolas Dufresne Committed by Arun Raghavan
Browse files

build: Sync defines and libs with build.gn

parent 1378babd
...@@ -51,26 +51,29 @@ AC_CHECK_HEADER(MobileCoreServices/MobileCoreServices.h, HAVE_IOS="yes", HAVE_IO ...@@ -51,26 +51,29 @@ AC_CHECK_HEADER(MobileCoreServices/MobileCoreServices.h, HAVE_IOS="yes", HAVE_IO
AS_CASE(["${host}"], AS_CASE(["${host}"],
[*android*], [*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" PLATFORM_CFLAGS="-DWEBRTC_POSIX"
HAVE_POSIX=1 HAVE_POSIX=1
], ],
[*-*linux*], [*-*linux*],
[ [
OS_CFLAGS="-DWEBRTC_LINUX" OS_CFLAGS="-DWEBRTC_LINUX -DWEBRTC_THREAD_RR"
PLATFORM_CFLAGS="-DWEBRTC_POSIX" PLATFORM_CFLAGS="-DWEBRTC_POSIX"
OS_LDFLAGS="-lrt"
HAVE_POSIX=1 HAVE_POSIX=1
], ],
[*-*darwin*], [*-*darwin*],
[ [
OS_CFLAGS="-DWEBRTC_MAC -DWEBRTC_THREAD_RR -DWEBRTC_CLOCK_TYPE_REALTIME"
AS_IF([test "$HAVE_IOS" = "yes"], AS_IF([test "$HAVE_IOS" = "yes"],
[OS_CFLAGS="-DWEBRTC_MAC -DWEBRTC_IOS"], [OS_CFLAGS+=" -DWEBRTC_IOS"])
[OS_CFLAGS="-DWEBRTC_MAC"])
PLATFORM_CFLAGS="-DWEBRTC_POSIX" PLATFORM_CFLAGS="-DWEBRTC_POSIX"
HAVE_POSIX=1 HAVE_POSIX=1
], ],
[*-mingw32*], [*-mingw32*],
[ [
OS_LDFLAGS="-lwinmm"
PLATFORM_CFLAGS="-DWEBRTC_WIN -D_WIN32 -U__STRICT_ANSI__" PLATFORM_CFLAGS="-DWEBRTC_WIN -D_WIN32 -U__STRICT_ANSI__"
HAVE_WIN=1 HAVE_WIN=1
], ],
...@@ -131,8 +134,10 @@ AM_CONDITIONAL([HAVE_NEON], [test "x$HAVE_NEON" = "x1"]) ...@@ -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_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_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_CFLAGS])
AC_SUBST([COMMON_CXXFLAGS]) AC_SUBST([COMMON_CXXFLAGS])
AC_SUBST([COMMON_LDFLAGS])
AC_CONFIG_FILES([ AC_CONFIG_FILES([
webrtc-audio-processing.pc webrtc-audio-processing.pc
......
...@@ -174,7 +174,7 @@ libwebrtc_audio_processing_la_LIBADD = $(top_builddir)/webrtc/libwebrtc.la \ ...@@ -174,7 +174,7 @@ libwebrtc_audio_processing_la_LIBADD = $(top_builddir)/webrtc/libwebrtc.la \
$(top_builddir)/webrtc/modules/audio_coding/libaudio_coding.la \ $(top_builddir)/webrtc/modules/audio_coding/libaudio_coding.la \
$(LIBWEBRTC_PRIVATEARCH) \ $(LIBWEBRTC_PRIVATEARCH) \
$(GNUSTL_LIBS) $(GNUSTL_LIBS)
libwebrtc_audio_processing_la_LDFLAGS = $(AM_LDFLAGS) \ libwebrtc_audio_processing_la_LDFLAGS = $(AM_LDFLAGS) $(COMMON_LDFLAGS) \
-Wl,--no-undefined \ -Wl,--no-undefined \
-version-info $(LIBWEBRTC_AUDIO_PROCESSING_VERSION_INFO) -version-info $(LIBWEBRTC_AUDIO_PROCESSING_VERSION_INFO)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment