diff options
| author | Gregory Mullen (grayhatter) <greg@grayhatter.com> | 2015-11-07 20:36:57 -0800 |
|---|---|---|
| committer | Gregory Mullen (grayhatter) <greg@grayhatter.com> | 2015-11-07 20:36:57 -0800 |
| commit | e1ad6cc8f9a5613439937096b55b476f65a00730 (patch) | |
| tree | 9dcf444c993681cc654f0e2874ab66264ec289c6 /toxav/Makefile.inc | |
| parent | 3631b460a6b763acda718bb71b7f6a1ee31a3299 (diff) | |
| parent | 6a494e2cbdd146bb13185d8220061322661a5f5a (diff) | |
Merge remote-tracking branch 'upstream/master' into rm-files
Diffstat (limited to 'toxav/Makefile.inc')
| -rw-r--r-- | toxav/Makefile.inc | 56 |
1 files changed, 30 insertions, 26 deletions
diff --git a/toxav/Makefile.inc b/toxav/Makefile.inc index 0b4b869d..083f862f 100644 --- a/toxav/Makefile.inc +++ b/toxav/Makefile.inc | |||
| @@ -1,38 +1,42 @@ | |||
| 1 | if BUILD_AV | 1 | if BUILD_AV |
| 2 | 2 | ||
| 3 | lib_LTLIBRARIES += libtoxav.la | 3 | lib_LTLIBRARIES += libtoxav.la |
| 4 | libtoxav_la_include_HEADERS = ../toxav/toxav.h | 4 | libtoxav_la_include_HEADERS = ../toxav/toxav.h |
| 5 | libtoxav_la_includedir = $(includedir)/tox | 5 | libtoxav_la_includedir = $(includedir)/tox |
| 6 | 6 | ||
| 7 | libtoxav_la_SOURCES = ../toxav/rtp.h \ | 7 | libtoxav_la_SOURCES = ../toxav/rtp.h \ |
| 8 | ../toxav/rtp.c \ | 8 | ../toxav/rtp.c \ |
| 9 | ../toxav/msi.h \ | 9 | ../toxav/msi.h \ |
| 10 | ../toxav/msi.c \ | 10 | ../toxav/msi.c \ |
| 11 | ../toxav/group.h \ | 11 | ../toxav/group.h \ |
| 12 | ../toxav/group.c \ | 12 | ../toxav/group.c \ |
| 13 | ../toxav/codec.h \ | 13 | ../toxav/audio.h \ |
| 14 | ../toxav/codec.c \ | 14 | ../toxav/audio.c \ |
| 15 | ../toxav/toxav.h \ | 15 | ../toxav/video.h \ |
| 16 | ../toxav/toxav.c | 16 | ../toxav/video.c \ |
| 17 | 17 | ../toxav/bwcontroler.h \ | |
| 18 | ../toxav/bwcontroler.c \ | ||
| 19 | ../toxav/toxav.h \ | ||
| 20 | ../toxav/toxav.c \ | ||
| 21 | ../toxav/toxav_old.c | ||
| 18 | 22 | ||
| 19 | libtoxav_la_CFLAGS = -I../toxcore \ | 23 | libtoxav_la_CFLAGS = -I../toxcore \ |
| 20 | -I../toxav \ | 24 | -I../toxav \ |
| 21 | $(LIBSODIUM_CFLAGS) \ | 25 | $(LIBSODIUM_CFLAGS) \ |
| 22 | $(NACL_CFLAGS) \ | 26 | $(NACL_CFLAGS) \ |
| 23 | $(AV_CFLAGS) \ | 27 | $(AV_CFLAGS) \ |
| 24 | $(PTHREAD_CFLAGS) | 28 | $(PTHREAD_CFLAGS) |
| 25 | 29 | ||
| 26 | libtoxav_la_LDFLAGS = $(TOXAV_LT_LDFLAGS) \ | 30 | libtoxav_la_LDFLAGS = $(TOXAV_LT_LDFLAGS) \ |
| 27 | $(LIBSODIUM_LDFLAGS) \ | 31 | $(LIBSODIUM_LDFLAGS) \ |
| 28 | $(NACL_LDFLAGS) \ | 32 | $(NACL_LDFLAGS) \ |
| 29 | $(EXTRA_LT_LDFLAGS) \ | 33 | $(EXTRA_LT_LDFLAGS) \ |
| 30 | $(WINSOCK2_LIBS) | 34 | $(WINSOCK2_LIBS) |
| 31 | 35 | ||
| 32 | libtoxav_la_LIBADD = libtoxcore.la \ | 36 | libtoxav_la_LIBADD = libtoxcore.la \ |
| 33 | $(LIBSODIUM_LIBS) \ | 37 | $(LIBSODIUM_LIBS) \ |
| 34 | $(NACL_LIBS) \ | 38 | $(NACL_LIBS) \ |
| 35 | $(PTHREAD_LIBS) \ | 39 | $(PTHREAD_LIBS) \ |
| 36 | $(AV_LIBS) | 40 | $(AV_LIBS) |
| 37 | 41 | ||
| 38 | endif \ No newline at end of file | 42 | endif \ No newline at end of file |