From add557cd514564b0ac91abb8e07d66ee76ccc16d Mon Sep 17 00:00:00 2001
From: Andrea Cavalli <andrea@cavallium.it>
Date: Sat, 10 Oct 2020 22:52:29 +0200
Subject: [PATCH] Update .gitignore, install_dependencies.sh, and
 setup_variables.sh

---
 .gitignore                     | 1 +
 travis/install_dependencies.sh | 1 +
 travis/setup_variables.sh      | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 3febf39..1d7f643 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,3 +52,4 @@ buildNumber.properties
 .mvn/wrapper/maven-wrapper.jar
 
 /generated/
+/vcpkg/
diff --git a/travis/install_dependencies.sh b/travis/install_dependencies.sh
index 07c21cc..bd14c88 100755
--- a/travis/install_dependencies.sh
+++ b/travis/install_dependencies.sh
@@ -31,6 +31,7 @@ elif [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
   choco install php --version=7.4.9 --package-parameters='"/ThreadSafe ""/InstallDir:C:\PHP"""'
   choco install python3 --params "/InstallDir:C:\Python3"
 
+  [ -d ./windowsenv/ ] && rm -rf ./windowsenv/
   git clone --depth=1 https://github.com/tdlight-team/windows-amd64-prebuilt-libraries.git windowsenv
   mv windowsenv/vcpkg $VCPKG_DIR
 else
diff --git a/travis/setup_variables.sh b/travis/setup_variables.sh
index fcffeb6..f9cf4f8 100755
--- a/travis/setup_variables.sh
+++ b/travis/setup_variables.sh
@@ -26,7 +26,7 @@ echo "============================="
 
 # ====== OS Variables
 if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
-  export VCPKG_DIR="$(realpath .)/generated/vcpkg"
+  export VCPKG_DIR="$(realpath .)/vcpkg"
   export CMAKE_EXTRA_ARGUMENTS="-A x64 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=$VCPKG_DIR/scripts/buildsystems/vcpkg.cmake"
   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"