From fe3045cae0ed8396ce50199fa82b1c6cf1bf6b7c Mon Sep 17 00:00:00 2001
From: Andrea Cavalli <andrea@cavallium.it>
Date: Tue, 18 Aug 2020 15:40:22 +0200
Subject: [PATCH] Update win.sh

---
 travis/win.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/travis/win.sh b/travis/win.sh
index deffc05..4c7a124 100644
--- a/travis/win.sh
+++ b/travis/win.sh
@@ -5,6 +5,13 @@ choco install gperf
 choco install strawberryperl 
 choco install openjdk11 -params 'installdir=c:\\java11'
 
+cd $TRAVIS_BUILD_DIR
+git clone https://github.com/Microsoft/vcpkg.git
+cd vcpkg
+./bootstrap-vcpkg.bat
+./vcpkg.exe install openssl:x64-windows zlib:x64-windows
+cd ..
+
 # openssl
 mkdir $TRAVIS_BUILD_DIR/openssl-root
 git clone https://github.com/openssl/openssl.git -b OpenSSL_1_1_1-stable
@@ -44,7 +51,7 @@ cd jnibuild
 export JAVA_HOME="c:\\java11"
 
 # Build
-cmake -DCMAKE_BUILD_TYPE=Release -DTD_ENABLE_JNI=ON  -DCMAKE_INSTALL_PREFIX:PATH=${TD_BIN_DIR} -DCMAKE_TOOLCHAIN_FILE:FILEPATH=$TRAVIS_BUILD_DIR\\vcpkg\\scripts\\buildsystems\\vcpkg.cmake ${TD_SRC_DIR}
+cmake -A x64 -DCMAKE_BUILD_TYPE=Release -DTD_ENABLE_JNI=ON  -DCMAKE_INSTALL_PREFIX:PATH=${TD_BIN_DIR} -DCMAKE_TOOLCHAIN_FILE:FILEPATH=$TRAVIS_BUILD_DIR\\vcpkg\\scripts\\buildsystems\\vcpkg.cmake ${TD_SRC_DIR}
 cmake --build . --target install
 
 
@@ -52,7 +59,7 @@ cd ../../../../../
 #mvn install -X
 
 cd src/main/jni/jtdlib/build
-cmake -DCMAKE_BUILD_TYPE=Release -DTd_DIR=${TD_BIN_DIR}/lib/cmake/Td -DJAVA_SRC_DIR=${JAVA_SRC_DIR} -DCMAKE_INSTALL_PREFIX:PATH=.. -DCMAKE_TOOLCHAIN_FILE:FILEPATH=$TRAVIS_BUILD_DIR\\vcpkg\\scripts\\buildsystems\\vcpkg.cmake ..
+cmake -A x64 -DCMAKE_BUILD_TYPE=Release -DTd_DIR=${TD_BIN_DIR}/lib/cmake/Td -DJAVA_SRC_DIR=${JAVA_SRC_DIR} -DCMAKE_INSTALL_PREFIX:PATH=.. -DCMAKE_TOOLCHAIN_FILE:FILEPATH=$TRAVIS_BUILD_DIR\\vcpkg\\scripts\\buildsystems\\vcpkg.cmake ..
 cmake --build . --target install
 
 cd ..