diff --git a/.travis.yml b/.travis.yml index df0a2515..b029b32c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,12 +22,12 @@ jobs: - if [ ! -f $HOME/Qt/5.14.2/clang_64/bin/qmake ]; then bash deploy/install-qt.sh -d $HOME/Qt --version 5.14.2 --toolchain clang_64 qtbase; fi - bash deploy/build_macos.sh - include: - name: Windows os: windows script: - bash -c "if [ ! -f /C/Qt/5.14.2/msvc2017/bin/qmake ]; then bash deploy/install-qt.sh -d /C/Qt --version 5.14.2 --toolchain win32_msvc2017 qtbase; fi" + - cd deploy && call "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\Tools\VsDevCmd.bat" && call "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvarsamd64_x86.bat" && windows.bat #before_cache: # - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then brew cleanup; fi diff --git a/deploy/windows.bat b/deploy/windows.bat index f46d23c6..8fee7614 100644 --- a/deploy/windows.bat +++ b/deploy/windows.bat @@ -2,8 +2,8 @@ CHCP 1252 -SET QT_BIN_DIR="c:\Devel\Qt\5.14.2\msvc2017\bin" -SET QIF_BIN_DIR="c:\Devel\Qt\Tools\QtInstallerFramework\4.0\bin" +SET QT_BIN_DIR="c:\Qt\5.14.2\msvc2017\bin" +SET QIF_BIN_DIR="c:\Qt\Tools\QtInstallerFramework\4.0\bin" set APP_NAME=AmneziaVPN set APP_FILENAME=%APP_NAME:"=%.exe