1
0
mirror of https://github.com/Tha14/toxic.git synced 2025-06-20 04:26:36 +02:00

Merge upsteam/master

This commit is contained in:
mannol
2014-02-22 23:58:36 +01:00
parent eb2d6afa00
commit e775c51a06
8 changed files with 128 additions and 29 deletions

View File

@ -41,3 +41,12 @@ toxic_LDADD = $(LIBTOXCORE_LDFLAGS) \
$(LIBSODIUM_LIBS) \
$(WINSOCK2_LIBS)
# For audio support
if BUILD_AV
toxic_SOURCES += $(top_srcdir)/src/audio_call.c \
$(top_srcdir)/src/audio_call.h
toxic_CFLAGS += $(LIBTOXAV_CFLAGS)
toxic_LDADD += $(LIBTOXAV_LIBS)
endif