From 60e7c12e92ba179317ba5ea0253000a196f5bf18 Mon Sep 17 00:00:00 2001 From: joe-conigliaro Date: Mon, 14 Oct 2019 16:51:12 +1100 Subject: [PATCH] put back temp removed flags and env vars (#2339) --- .github/workflows/ci.yml | 8 ++++---- .travis.yml | 2 +- make.bat | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 322b2f0907..dc10d35749 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -85,14 +85,14 @@ jobs: # with: # node-version: 12.x - name: Build - #env: - # VFLAGS: -cc msvc + env: + VFLAGS: -cc msvc run: | git clone --depth=1 https://github.com/ubawurinna/freetype-windows-binaries.git thirdparty/freetype/ .\make.bat -msvc - name: Test - #env: - # VFLAGS: -cc msvc + env: + VFLAGS: -cc msvc run: | .\v.exe test v ## v.js dosent work on windows diff --git a/.travis.yml b/.travis.yml index 26ac0b5e3d..572b818a92 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,7 +49,7 @@ script: fi if [[ "${TRAVIS_JOB_NAME}" == "windows_msvc" ]]; then echo "Building V with MSVC" - #export VFLAGS="-cc msvc" + export VFLAGS="-cc msvc" ./make.bat -msvc fi diff --git a/make.bat b/make.bat index 1d1b8a0c3d..568205d52b 100644 --- a/make.bat +++ b/make.bat @@ -69,7 +69,7 @@ if %ERRORLEVEL% NEQ 0 ( ) echo rebuild from source (twice, in case of C definitions changes) -v2.exe -o v3.exe v.v +v2.exe -cc msvc -o v3.exe v.v v3.exe -cc msvc -o v.exe -prod v.v if %ERRORLEVEL% NEQ 0 ( echo V failed to build itself