From d65297916d3053f7d699647c43d855eee893e4ac Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Sun, 11 Oct 2020 04:12:41 +0200 Subject: [PATCH] Update tdlight and compile_tdjni.sh --- implementations/tdlight | 2 +- scripts/compile_tdjni.sh | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/implementations/tdlight b/implementations/tdlight index 459e08c..be83b71 160000 --- a/implementations/tdlight +++ b/implementations/tdlight @@ -1 +1 @@ -Subproject commit 459e08c1b46d67e80777355e011e615f703184c8 +Subproject commit be83b71452454bbdf1e73db58025256a93a6b320 diff --git a/scripts/compile_tdjni.sh b/scripts/compile_tdjni.sh index decb5c5..6bac719 100755 --- a/scripts/compile_tdjni.sh +++ b/scripts/compile_tdjni.sh @@ -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 ./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 echo "Configuring CMake..." cd ./generated/tdjni_build/ cmake \ -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/) \ -DTDNATIVES_BIN_DIR=$(realpath -m ../tdjni_bin/) \ -DTDNATIVES_DOCS_BIN_DIR=$(realpath -m ../tdjni_docs/) \