tdlight-team
/
tdlight-java-natives
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Update generate_td_tools.sh and setup_variables.sh

This commit is contained in:
Andrea Cavalli 2020-10-11 02:12:20 +02:00
parent 97e7fdc8f1
commit 4d6dd85ea9
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/generate_td_tools.sh
View File

@ -48,11 +48,7 @@ cp -r implementations/${IMPLEMENTATION_NAME} ./generated/implementation
echo "Configuring CMake..."
mkdir ./generated/td_tools/
cd ./generated/td_tools/
cmake \
-DCMAKE_BUILD_TYPE=Release \
-DTD_ENABLE_JNI=ON \
${CMAKE_EXTRA_ARGUMENTS} \
../implementation/
cmake -DCMAKE_BUILD_TYPE=Release -DTD_ENABLE_JNI=ON ${CMAKE_EXTRA_ARGUMENTS} ../implementation/
# Run cmake to generate common tools
echo "Generating cross compilation tools..."

2
travis/setup_variables.sh
View File

@ -27,7 +27,7 @@ echo "============================="
# ====== OS Variables
if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
export VCPKG_DIR="$(realpath .)/vcpkg"
export CMAKE_EXTRA_ARGUMENTS="-A x64 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=$VCPKG_DIR/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static -DCMAKE_BUILD_TYPE=Release -DVCPKG_BUILD_TYPE=release"
export CMAKE_EXTRA_ARGUMENTS="-A x64 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=$VCPKG_DIR/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static"
export PATH="$PATH:/c/tools/php74:/c/PHP:/c/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/VC/Tools/MSVC/14.27.29110/bin/Hostx64/x64:/c/Program Files/OpenJDK/openjdk-11.0.8_10/bin:/c/Program Files/CMake/bin:/c/ProgramData/chocolatey/bin:/c/Program Files/apache-maven-3.6.3/bin:/c/ProgramData/chocolatey/lib/maven/apache-maven-3.6.3/bin:/c/ProgramData/chocolatey/lib/base64/tools:/c/Program Files/NASM"
export JAVA_HOME="/c/Program Files/OpenJDK/openjdk-11.0.8_10"
export CPU_CORES=" -- -m"