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

Update install_dependencies.sh and setup_variables.sh

Browse Source
This commit is contained in:
Andrea Cavalli 2020-10-10 23:14:17 +02:00
parent 0142f829eb
commit 954475c1f1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
travis/install_dependencies.sh
View File

@ -34,7 +34,7 @@ elif [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
[ -d ./windowsenv/ ] && $(yes | rm -rf ./windowsenv/) [ -d ./windowsenv/ ] && $(yes | rm -rf ./windowsenv/)
[ -d $VCPKG_DIR ] && $(yes | rm -rf $VCPKG_DIR) [ -d $VCPKG_DIR ] && $(yes | rm -rf $VCPKG_DIR)
git clone --depth=1 https://github.com/tdlight-team/windows-amd64-prebuilt-libraries.git windowsenv git clone --depth=1 https://github.com/tdlight-team/windows-amd64-prebuilt-libraries.git windowsenv
mv windowsenv/vcpkg/. $VCPKG_DIR mv windowsenv/vcpkg $VCPKG_DIR
else else
echo "Unrecognized os: $TRAVIS_OS_NAME" echo "Unrecognized os: $TRAVIS_OS_NAME"
exit 1 exit 1

2
travis/setup_variables.sh
View File

@ -27,7 +27,7 @@ echo "============================="
# ====== OS Variables # ====== OS Variables
if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
export VCPKG_DIR="$(realpath .)/vcpkg" export VCPKG_DIR="$(realpath .)/vcpkg"
export CMAKE_EXTRA_ARGUMENTS="-A x64 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=$VCPKG_DIR/scripts/buildsystems/vcpkg.cmake -DCMAKE_CL_64=1 -DVCPKG_TARGET_TRIPLET=x64-windows -DCMAKE_PREFIX_PATH=$VCPKG_DIR/installed/x64-windows" export CMAKE_EXTRA_ARGUMENTS="-A x64 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=$VCPKG_DIR/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows"
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 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 JAVA_HOME="/c/Program Files/OpenJDK/openjdk-11.0.8_10"
export CPU_CORES=" -- -m" export CPU_CORES=" -- -m"