mirror of
https://github.com/irungentoo/toxcore.git
synced 2024-03-22 13:30:51 +08:00
pkg-config and av
This commit is contained in:
parent
bc61d969e0
commit
4888d916d0
12
Makefile.am
12
Makefile.am
@ -3,8 +3,9 @@ SUBDIRS = build
|
|||||||
ACLOCAL_AMFLAGS = -I m4
|
ACLOCAL_AMFLAGS = -I m4
|
||||||
|
|
||||||
pkgconfigdir = $(libdir)/pkgconfig
|
pkgconfigdir = $(libdir)/pkgconfig
|
||||||
pkgconfig_DATA = $(top_builddir)/libtoxcore.pc
|
|
||||||
|
|
||||||
|
|
||||||
|
pkgconfig_DATA = $(top_builddir)/libtoxcore.pc
|
||||||
BUILT_SOURCES = $(top_builddir)/libtoxcore.pc
|
BUILT_SOURCES = $(top_builddir)/libtoxcore.pc
|
||||||
CLEANFILES = $(top_builddir)/libtoxcore.pc
|
CLEANFILES = $(top_builddir)/libtoxcore.pc
|
||||||
|
|
||||||
@ -18,3 +19,12 @@ EXTRA_DIST = \
|
|||||||
$(top_srcdir)/tools/astylerc \
|
$(top_srcdir)/tools/astylerc \
|
||||||
$(top_srcdir)/tools/pre-commit
|
$(top_srcdir)/tools/pre-commit
|
||||||
|
|
||||||
|
if BUILD_AV
|
||||||
|
|
||||||
|
pkgconfig_DATA += $(top_builddir)/libtoxav.pc
|
||||||
|
BUILT_SOURCES += $(top_builddir)/libtoxav.pc
|
||||||
|
CLEANFILES += $(top_builddir)/libtoxav.pc
|
||||||
|
|
||||||
|
EXTRA_DIST += libtoxav.pc.in
|
||||||
|
|
||||||
|
endif
|
@ -8,5 +8,5 @@ include ../toxcore/Makefile.inc
|
|||||||
include ../toxav/Makefile.inc
|
include ../toxav/Makefile.inc
|
||||||
include ../other/Makefile.inc
|
include ../other/Makefile.inc
|
||||||
include ../testing/Makefile.inc
|
include ../testing/Makefile.inc
|
||||||
include ../other/bootstrap_serverdaemon/Makefile.inc
|
include ../other/bootstrap_daemon/Makefile.inc
|
||||||
include ../auto_tests/Makefile.inc
|
include ../auto_tests/Makefile.inc
|
||||||
|
37
configure.ac
37
configure.ac
@ -22,11 +22,6 @@ dnl revision: increment if source code has changed, set to zero if current is
|
|||||||
dnl incremented
|
dnl incremented
|
||||||
dnl age: increment if interfaces have been added, set to zero if
|
dnl age: increment if interfaces have been added, set to zero if
|
||||||
dnl interfaces have been removed or changed
|
dnl interfaces have been removed or changed
|
||||||
TOXCORE_LT_LDFLAGS="-version-info $LIBTOXCORE_LT_VERSION"
|
|
||||||
TOXAV_LT_LDFLAGS="-version-info $LIBTOXAV_LT_VERSION"
|
|
||||||
|
|
||||||
AC_SUBST(TOXCORE_LT_LDFLAGS)
|
|
||||||
AC_SUBST(TOXAV_LT_LDFLAGS)
|
|
||||||
|
|
||||||
if test "x${prefix}" = "xNONE"; then
|
if test "x${prefix}" = "xNONE"; then
|
||||||
prefix="${ac_default_prefix}"
|
prefix="${ac_default_prefix}"
|
||||||
@ -44,6 +39,22 @@ LIBCONFIG_FOUND="no"
|
|||||||
LIBCHECK_FOUND="no"
|
LIBCHECK_FOUND="no"
|
||||||
WANT_NACL="no"
|
WANT_NACL="no"
|
||||||
|
|
||||||
|
TOXCORE_LT_LDFLAGS="-version-info $LIBTOXCORE_LT_VERSION"
|
||||||
|
TOXAV_LT_LDFLAGS="-version-info $LIBTOXAV_LT_VERSION"
|
||||||
|
|
||||||
|
AC_ARG_ENABLE([soname-versions],
|
||||||
|
[AC_HELP_STRING([--enable-soname-versions], [enable soname versions (must be disabled for android) (default: enabled)]) ],
|
||||||
|
[
|
||||||
|
if test "x$enableval" = "xno"; then
|
||||||
|
TOXCORE_LT_LDFLAGS="-avoid-version"
|
||||||
|
TOXAV_LT_LDFLAGS="-avoid-version"
|
||||||
|
fi
|
||||||
|
]
|
||||||
|
)
|
||||||
|
|
||||||
|
AC_SUBST(TOXCORE_LT_LDFLAGS)
|
||||||
|
AC_SUBST(TOXAV_LT_LDFLAGS)
|
||||||
|
|
||||||
AC_ARG_ENABLE([nacl],
|
AC_ARG_ENABLE([nacl],
|
||||||
[AC_HELP_STRING([--enable-nacl], [use nacl instead of libsodium (default: disabled)]) ],
|
[AC_HELP_STRING([--enable-nacl], [use nacl instead of libsodium (default: disabled)]) ],
|
||||||
[
|
[
|
||||||
@ -459,6 +470,16 @@ if test "x$BUILD_AV" = "xyes"; then
|
|||||||
)
|
)
|
||||||
fi
|
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"
|
||||||
|
AC_SUBST(AV_LIBS)
|
||||||
|
|
||||||
|
AV_CFLAGS="$OPUS_CFLAGS $VPX_CFLAGS"
|
||||||
|
AC_SUBST(AV_CFLAGS)
|
||||||
|
fi
|
||||||
|
|
||||||
if test -n "$PKG_CONFIG"; then
|
if test -n "$PKG_CONFIG"; then
|
||||||
if test "x$BUILD_TESTS" = "xyes"; then
|
if test "x$BUILD_TESTS" = "xyes"; then
|
||||||
PKG_CHECK_MODULES([CHECK], [check],
|
PKG_CHECK_MODULES([CHECK], [check],
|
||||||
@ -625,4 +646,10 @@ AC_CONFIG_FILES([Makefile
|
|||||||
build/Makefile
|
build/Makefile
|
||||||
libtoxcore.pc
|
libtoxcore.pc
|
||||||
])
|
])
|
||||||
|
|
||||||
|
AM_COND_IF(BUILD_AV,
|
||||||
|
[
|
||||||
|
AC_CONFIG_FILES([libtoxav.pc])
|
||||||
|
],)
|
||||||
|
|
||||||
AC_OUTPUT
|
AC_OUTPUT
|
||||||
|
@ -12,9 +12,9 @@ can use Tox regardless of the quality of their internet connection.
|
|||||||
|
|
||||||
How it's probably going to work:
|
How it's probably going to work:
|
||||||
1. Alice, a Tox client on a TCP only network generates a temporary public key
|
1. Alice, a Tox client on a TCP only network generates a temporary public key
|
||||||
and connects to a bootstrap server.
|
and connects to a bootstrap node.
|
||||||
|
|
||||||
2. Using the bootstrap server she find and connects to a couple (exact number
|
2. Using the bootstrap node she find and connects to a couple (exact number
|
||||||
to be determined later) number of random nodes that have TCP relay support.
|
to be determined later) number of random nodes that have TCP relay support.
|
||||||
|
|
||||||
3. She uses the onion through the TCP relay connections to send friend requests
|
3. She uses the onion through the TCP relay connections to send friend requests
|
||||||
|
@ -39,6 +39,8 @@ Friend_requests.c:
|
|||||||
[NOT STARTED] Group chats (They work with IPv6 but some things need to be tested.)
|
[NOT STARTED] Group chats (They work with IPv6 but some things need to be tested.)
|
||||||
|
|
||||||
|
|
||||||
|
[NOT STARTED] Make the core save/datafile portable across client versions/different processor architectures.
|
||||||
|
|
||||||
[NOT STARTED] A way for people to connect to people on Tox if they are behind a bad NAT that
|
[NOT STARTED] A way for people to connect to people on Tox if they are behind a bad NAT that
|
||||||
blocks UDP (or is just unpunchable) (docs/TCP_Network.txt)
|
blocks UDP (or is just unpunchable) (docs/TCP_Network.txt)
|
||||||
|
|
||||||
|
@ -7,7 +7,7 @@ But:
|
|||||||
Vastly simplified packet format and encryption.
|
Vastly simplified packet format and encryption.
|
||||||
|
|
||||||
Boostrapping:
|
Boostrapping:
|
||||||
The first time you install the client we bootstrap it with a node on our servers.(bandwidth should not be a problem as the client only needs to be sent one reply.)
|
The first time you install the client we bootstrap it with a node. (bandwidth should not be a problem as the client only needs to be sent one reply.)
|
||||||
|
|
||||||
|
|
||||||
Basics
|
Basics
|
||||||
|
11
libtoxav.pc.in
Normal file
11
libtoxav.pc.in
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
prefix=@prefix@
|
||||||
|
exec_prefix=@exec_prefix@
|
||||||
|
libdir=@libdir@
|
||||||
|
includedir=@includedir@
|
||||||
|
|
||||||
|
Name: libtoxav
|
||||||
|
Description: Tox A/V library
|
||||||
|
Requires:
|
||||||
|
Version: @PACKAGE_VERSION@
|
||||||
|
Libs: -L${libdir} -ltoxav @AV_LIBS@
|
||||||
|
Cflags: -I${includedir}
|
@ -9,4 +9,3 @@ Requires:
|
|||||||
Version: @PACKAGE_VERSION@
|
Version: @PACKAGE_VERSION@
|
||||||
Libs: -L${libdir} -ltoxcore @LIBS@
|
Libs: -L${libdir} -ltoxcore @LIBS@
|
||||||
Cflags: -I${includedir}
|
Cflags: -I${includedir}
|
||||||
|
|
||||||
|
@ -19,8 +19,7 @@ libtoxav_la_SOURCES = ../toxav/event.h \
|
|||||||
libtoxav_la_CFLAGS = -I../toxcore \
|
libtoxav_la_CFLAGS = -I../toxcore \
|
||||||
-I../toxav \
|
-I../toxav \
|
||||||
$(NACL_CFLAGS) \
|
$(NACL_CFLAGS) \
|
||||||
$(OPUS_CFLAGS) \
|
$(AV_CFLAGS) \
|
||||||
$(VPX_CFLAGS) \
|
|
||||||
$(PTHREAD_CFLAGS)
|
$(PTHREAD_CFLAGS)
|
||||||
|
|
||||||
libtoxav_la_LDFLAGS = $(TOXAV_LT_LDFLAGS) \
|
libtoxav_la_LDFLAGS = $(TOXAV_LT_LDFLAGS) \
|
||||||
@ -28,9 +27,8 @@ libtoxav_la_LDFLAGS = $(TOXAV_LT_LDFLAGS) \
|
|||||||
$(EXTRA_LT_LDFLAGS)
|
$(EXTRA_LT_LDFLAGS)
|
||||||
|
|
||||||
libtoxav_la_LIBS = $(NACL_LIBS) \
|
libtoxav_la_LIBS = $(NACL_LIBS) \
|
||||||
$(OPUS_LIBS) \
|
$(PTHREAD_LIBS) \
|
||||||
$(VPX_LIBS) \
|
$(AV_LIBS)
|
||||||
$(PTHREAD_LIBS)
|
|
||||||
|
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
@ -29,9 +29,6 @@
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include "event.h"
|
#include "event.h"
|
||||||
|
|
||||||
#include "../toxcore/util.h"
|
|
||||||
#include "../toxcore/network.h"
|
|
||||||
|
|
||||||
#define _GNU_SOURCE
|
#define _GNU_SOURCE
|
||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
@ -30,9 +30,6 @@
|
|||||||
|
|
||||||
#include "msi.h"
|
#include "msi.h"
|
||||||
#include "event.h"
|
#include "event.h"
|
||||||
#include "../toxcore/util.h"
|
|
||||||
#include "../toxcore/network.h"
|
|
||||||
#include "../toxcore/Messenger.h"
|
|
||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user