srctree

Robin Linden parent e206af22 72073e1e
Update to Toxcore 0.2.18

gradle/libs.versions.toml added: 7, removed: 23, total 0

@@ -12,7 +12,7 @@ espresso = "3.4.0"

lifecycle = "2.4.1"

navigation = "2.4.2"

room = "2.4.2"

tox4j-android = "0.2.17"

tox4j-android = "0.2.18"

tox4j-core = "0.2.3"

[plugins]

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

@@ -33,7 +33,6 @@ 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: 7, removed: 23, total 0

@@ -41,7 +41,6 @@ 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: 7, removed: 23, total 0

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

# toxcore

$(SRCDIR)/toxcore:

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

git clone --depth=1 --branch=v0.2.18 --recursive 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 msgpack opus libvpx,$(PREFIX)/$i.stamp)

$(PREFIX)/toxcore.stamp: $(SRCDIR)/toxcore $(TOOLCHAIN_FILE) $(foreach i,libsodium 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,20 +101,6 @@ $(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