Update tdlight and compile_tdjni.sh

This commit is contained in:
Andrea Cavalli 2020-10-11 04:12:41 +02:00
parent 0c05415adc
commit d65297916d
2 changed files with 10 additions and 2 deletions

@ -1 +1 @@
Subproject commit 459e08c1b46d67e80777355e011e615f703184c8 Subproject commit be83b71452454bbdf1e73db58025256a93a6b320

View File

@ -56,12 +56,20 @@ cp -r ./src/main/jni-cpp-src/${IMPLEMENTATION_NAME}/. ./generated/src/main/jni-c
cp -r ./src/main/jni-java-src ./generated/src/main/jni-java-src cp -r ./src/main/jni-java-src ./generated/src/main/jni-java-src
cp ./generated/src/main/java/it/tdlight/jni/TdApi.java ./generated/src/main/jni-java-src/it/tdlight/jni/TdApi.java cp ./generated/src/main/java/it/tdlight/jni/TdApi.java ./generated/src/main/jni-java-src/it/tdlight/jni/TdApi.java
# Copy executables
echo "Copying executables..."
if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
export TD_GENERATED_BINARIES_DIR=$(realpath -m ./generated/td_tools/td/generate/Release)
else
export TD_GENERATED_BINARIES_DIR=$(realpath -m ./generated/td_tools/td/generate)
fi
# Configure cmake # Configure cmake
echo "Configuring CMake..." echo "Configuring CMake..."
cd ./generated/tdjni_build/ cd ./generated/tdjni_build/
cmake \ cmake \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DTD_GENERATED_BINARIES_DIR=$(realpath -m ../td_tools/td/generate/) \ -DTD_GENERATED_BINARIES_DIR=${TD_GENERATED_BINARIES_DIR} \
-DTD_SRC_DIR=$(realpath -m ../implementation/) \ -DTD_SRC_DIR=$(realpath -m ../implementation/) \
-DTDNATIVES_BIN_DIR=$(realpath -m ../tdjni_bin/) \ -DTDNATIVES_BIN_DIR=$(realpath -m ../tdjni_bin/) \
-DTDNATIVES_DOCS_BIN_DIR=$(realpath -m ../tdjni_docs/) \ -DTDNATIVES_DOCS_BIN_DIR=$(realpath -m ../tdjni_docs/) \