diff options
| author | irungentoo <irungentoo@gmail.com> | 2014-05-08 18:26:01 -0400 |
|---|---|---|
| committer | irungentoo <irungentoo@gmail.com> | 2014-05-08 18:26:01 -0400 |
| commit | a26ced5fcb7a9a8bf6b4795c95b04277c14b84f2 (patch) | |
| tree | 8a659c2dc15414ff227cf43c793f20ee2a91cbe1 /toxav/Makefile.inc | |
| parent | 98f20c76de801d042c695b3034056b2cfbfeaab5 (diff) | |
| parent | 89022326d3742defd9c7b1111ddcda53688d85be (diff) | |
Merge branch 'master' into TCP
Diffstat (limited to 'toxav/Makefile.inc')
| -rw-r--r-- | toxav/Makefile.inc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/toxav/Makefile.inc b/toxav/Makefile.inc index c3ab0da2..60b50ff0 100644 --- a/toxav/Makefile.inc +++ b/toxav/Makefile.inc | |||
| @@ -18,15 +18,18 @@ libtoxav_la_SOURCES = ../toxav/event.h \ | |||
| 18 | 18 | ||
| 19 | libtoxav_la_CFLAGS = -I../toxcore \ | 19 | libtoxav_la_CFLAGS = -I../toxcore \ |
| 20 | -I../toxav \ | 20 | -I../toxav \ |
| 21 | $(LIBSODIUM_CFLAGS) \ | ||
| 21 | $(NACL_CFLAGS) \ | 22 | $(NACL_CFLAGS) \ |
| 22 | $(AV_CFLAGS) \ | 23 | $(AV_CFLAGS) \ |
| 23 | $(PTHREAD_CFLAGS) | 24 | $(PTHREAD_CFLAGS) |
| 24 | 25 | ||
| 25 | libtoxav_la_LDFLAGS = $(TOXAV_LT_LDFLAGS) \ | 26 | libtoxav_la_LDFLAGS = $(TOXAV_LT_LDFLAGS) \ |
| 27 | $(LIBSODIUM_LDFLAGS) \ | ||
| 26 | $(NACL_LDFLAGS) \ | 28 | $(NACL_LDFLAGS) \ |
| 27 | $(EXTRA_LT_LDFLAGS) | 29 | $(EXTRA_LT_LDFLAGS) |
| 28 | 30 | ||
| 29 | libtoxav_la_LIBADD = libtoxcore.la \ | 31 | libtoxav_la_LIBADD = libtoxcore.la \ |
| 32 | $(LIBSODIUM_LIBS) \ | ||
| 30 | $(NACL_LIBS) \ | 33 | $(NACL_LIBS) \ |
| 31 | $(PTHREAD_LIBS) \ | 34 | $(PTHREAD_LIBS) \ |
| 32 | $(AV_LIBS) | 35 | $(AV_LIBS) |