From 33cc24ec85924ea140d78e6a3bc5eb615a3eb979 Mon Sep 17 00:00:00 2001 From: vit9696 Date: Mon, 18 May 2020 10:20:31 +0300 Subject: [PATCH] Build: Add VS2017 toolchain testing --- .travis.yml | 8 ++++++++ Utilities/macserial/build.tool | 8 +++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index d6101138..98b598b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -113,3 +113,11 @@ matrix: build_command_prepend: "./build_oc.tool --skip-build --skip-package && cd UDK ; src=$(curl -Lfs https://raw.githubusercontent.com/acidanthera/Lilu/master/Lilu/Scripts/covstrap.sh) && eval \"$src\" || exit 1" build_command: "../build_oc.tool --skip-tests --skip-package RELEASE" branch_pattern: master + + - os: windows + name: "Build Windows VS2017" + + script: + - BUILD_UTILITIES=0 + - choco install microsoft-build-tools visualcpp-build-tools nasm python zip + - "./build_oc.tool" diff --git a/Utilities/macserial/build.tool b/Utilities/macserial/build.tool index f5ccbd36..d8ef73bb 100755 --- a/Utilities/macserial/build.tool +++ b/Utilities/macserial/build.tool @@ -1,10 +1,5 @@ #!/bin/bash -if [ "$(uname | grep MINGW)" != "" ]; then - echo "MinGW is currently not supported" - exit 0 -fi - if [ "$(uname)" = "Darwin" ] ; then KERNEL_TAG="$(uname -r | cut -f1 -d'.')" @@ -25,6 +20,9 @@ if [ "$(uname)" = "Darwin" ] ; then MACOS_MIN="10.4" fi fi +elif [ "$(which gcc)" = "" ]; then + echo "GCC is required for compilation with this script" + exit 0 fi cd "$(dirname "$0")" || exit 1