Fix libtoxav link error.

This commit is contained in:
AZ Huang 2014-03-05 18:51:22 +08:00
parent ce6440c5a2
commit 7f3e1aec52
3 changed files with 18 additions and 17 deletions

View File

@ -34,7 +34,7 @@ before_script:
#installing vpx
- git clone http://git.chromium.org/webm/libvpx.git > /dev/null
- cd libvpx
- ./configure > /dev/null
- ./configure --enable-shared > /dev/null
- make -j3 >/dev/null
- sudo make install > /dev/null
- cd ..

View File

@ -487,9 +487,9 @@ fi
if test "x$BUILD_AV" = "xyes"; then
# toxcore lib needs an global?
# So far this works okay
AV_LIBS="$OPUS_LIBS $VPX_LIBS -ltoxcore"
AV_LIBS="$OPUS_LIBS $VPX_LIBS"
AC_SUBST(AV_LIBS)
AV_CFLAGS="$OPUS_CFLAGS $VPX_CFLAGS"
AC_SUBST(AV_CFLAGS)
fi

View File

@ -25,25 +25,26 @@ libtoxav_la_CFLAGS = -I../toxcore \
libtoxav_la_LDFLAGS = $(TOXAV_LT_LDFLAGS) \
$(NACL_LDFLAGS) \
$(EXTRA_LT_LDFLAGS)
libtoxav_la_LIBS = $(NACL_LIBS) \
libtoxav_la_LIBADD = libtoxcore.la \
$(NACL_LIBS) \
$(PTHREAD_LIBS) \
$(AV_LIBS)
endif
if BUILD_PHONE
noinst_PROGRAMS += phone
phone_SOURCES = ../toxav/phone.c
phone_SOURCES = ../toxav/phone.c
phone_CFLAGS = -I../toxcore \
-I../toxav \
@ -68,6 +69,6 @@ phone_LDADD = libtoxav.la \
$(VPX_LIBS)\
$(PTHREAD_LIBS)\
$(NACL_LIBS)
endif
endif