srctree

Robin Linden parent 1cef4059 f62a6a17
Update to Toxcore 0.2.16

We now also cross-compile msgpack as Toxcore 0.2.16 depends on it.

inline split

buildSrc/src/main/kotlin/Dependencies.kt added: 23, removed: 7, total 16

@@ -120,7 +120,7 @@ object Tox4j {

const val api = "org.toktok:tox4j-api_2.11:$version"

const val c = "org.toktok:tox4j-c_2.11:$version"

object Android {

private const val version = "0.2.15"

private const val version = "0.2.16"

const val x86_64 = "org.toktok:tox4j-c_x86_64-linux-android:$version"

const val arm = "org.toktok:tox4j-c_armv7a-linux-androideabi:$version"

const val aarch64 = "org.toktok:tox4j-c_aarch64-linux-android:$version"

scripts/android.mk added: 23, removed: 7, total 16

@@ -33,6 +33,7 @@ protobuf_CONFIGURE := --prefix=$(PREFIX) --host=$(TARGET) --with-sysroot=$(SYSRO

libsodium_CONFIGURE := --prefix=$(PREFIX) --host=$(TARGET) --with-sysroot=$(SYSROOT) --disable-shared

opus_CONFIGURE := --prefix=$(PREFIX) --host=$(TARGET) --with-sysroot=$(SYSROOT) --disable-shared

libvpx_CONFIGURE := --prefix=$(PREFIX) --libc=$(SYSROOT) --target=$(VPX_TARGET) --disable-examples --disable-unit-tests --enable-pic

msgpack_CONFIGURE := -DCMAKE_INSTALL_PREFIX:PATH=$(PREFIX) -DCMAKE_TOOLCHAIN_FILE=$(TOOLCHAIN_FILE) -DANDROID_CPU_FEATURES=$(NDK_HOME)/sources/android/cpufeatures/cpu-features.c -DBUILD_SHARED_LIBS=OFF

toxcore_CONFIGURE := -DCMAKE_INSTALL_PREFIX:PATH=$(PREFIX) -DCMAKE_TOOLCHAIN_FILE=$(TOOLCHAIN_FILE) -DANDROID_CPU_FEATURES=$(NDK_HOME)/sources/android/cpufeatures/cpu-features.c -DENABLE_STATIC=ON -DENABLE_SHARED=OFF

tox4j_CONFIGURE := -DCMAKE_INSTALL_PREFIX:PATH=$(PREFIX) -DCMAKE_TOOLCHAIN_FILE=$(TOOLCHAIN_FILE) -DANDROID_CPU_FEATURES=$(NDK_HOME)/sources/android/cpufeatures/cpu-features.c

scripts/build-host added: 23, removed: 7, total 16

@@ -41,6 +41,7 @@ protobuf_CONFIGURE := --prefix=$(PREFIX) --disable-shared

libsodium_CONFIGURE := --prefix=$(PREFIX) --disable-shared

opus_CONFIGURE := --prefix=$(PREFIX) --disable-shared

libvpx_CONFIGURE := --prefix=$(PREFIX) --disable-examples --disable-unit-tests --enable-pic

msgpack_CONFIGURE := -DCMAKE_INSTALL_PREFIX:PATH=$(PREFIX) -DBUILD_SHARED_LIBS=OFF

toxcore_CONFIGURE := -DCMAKE_INSTALL_PREFIX:PATH=$(PREFIX) -DENABLE_STATIC=ON -DENABLE_SHARED=OFF

tox4j_CONFIGURE := -DCMAKE_INSTALL_PREFIX:PATH=$(PREFIX)

scripts/dependencies.mk added: 23, removed: 7, total 16

@@ -90,10 +90,10 @@ $(PREFIX)/protobuf.stamp: $(SRCDIR)/protobuf $(TOOLCHAIN_FILE) $(PROTOC)

# toxcore

$(SRCDIR)/toxcore:

git clone --depth=1 --branch=v0.2.15 https://github.com/TokTok/c-toxcore $@;

git clone --depth=1 --branch=v0.2.16 https://github.com/TokTok/c-toxcore $@;

$(PREFIX)/toxcore.stamp: $(foreach f,$(shell cd $(SRCDIR)/toxcore && git ls-files),$(SRCDIR)/toxcore/$f)

$(PREFIX)/toxcore.stamp: $(SRCDIR)/toxcore $(TOOLCHAIN_FILE) $(foreach i,libsodium opus libvpx,$(PREFIX)/$i.stamp)

$(PREFIX)/toxcore.stamp: $(SRCDIR)/toxcore $(TOOLCHAIN_FILE) $(foreach i,libsodium msgpack opus libvpx,$(PREFIX)/$i.stamp)

@$(PRE_RULE)

mkdir -p $(BUILDDIR)/$(notdir $<)

cd $(BUILDDIR)/$(notdir $<) && cmake $(SRCDIR)/$(notdir $<) $($(notdir $<)_CONFIGURE) -DMUST_BUILD_TOXAV=ON -DBOOTSTRAP_DAEMON=OFF

@@ -101,6 +101,20 @@ $(PREFIX)/toxcore.stamp: $(SRCDIR)/toxcore $(TOOLCHAIN_FILE) $(foreach i,libsodi

mkdir -p $(@D) && touch $@

@$(POST_RULE)

#############################################################################

# msgpack

$(SRCDIR)/msgpack:

git clone --depth=1 --branch=c-4.0.0 https://github.com/msgpack/msgpack-c $@

$(PREFIX)/msgpack.stamp: $(SRCDIR)/msgpack $(TOOLCHAIN_FILE)

@$(PRE_RULE)

mkdir -p $(BUILDDIR)/$(notdir $<)

cd $(BUILDDIR)/$(notdir $<) && cmake $(SRCDIR)/$(notdir $<) $($(notdir $<)_CONFIGURE)

$(MAKE) -C $(BUILDDIR)/$(notdir $<) install

mkdir -p $(@D) && touch $@

@$(POST_RULE)

#############################################################################

# libsodium