From feb77c8a1c348cff72de33ba4784fee543284e65 Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Tue, 26 Nov 2019 21:29:22 -0800 Subject: Updated travis and appveyor build scripts --- .travis.yml | 18 ++++++++++-------- DiligentCore | 2 +- DiligentTools | 2 +- appveyor.yml | 2 +- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 240a4a5..5412a74 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,29 +57,31 @@ matrix: include: - os: linux compiler: gcc - env: CONFIG=Debug - - os: linux - compiler: gcc - env: CONFIG=Release + env: + - CONFIG=Debug - os: osx compiler: clang env: - - CONFIG=Release + - CONFIG=Debug - IOS=false - os: osx compiler: clang env: - CONFIG=Debug - - IOS=false + - IOS=true + - os: linux + compiler: gcc + env: + - CONFIG=Release - os: osx compiler: clang env: - CONFIG=Release - - IOS=true + - IOS=false - os: osx compiler: clang env: - - CONFIG=Debug + - CONFIG=Release - IOS=true script: diff --git a/DiligentCore b/DiligentCore index d45d86e..9d048a6 160000 --- a/DiligentCore +++ b/DiligentCore @@ -1 +1 @@ -Subproject commit d45d86e47888ac7269d4f07d41305981618cc4d2 +Subproject commit 9d048a635129f31b06ef8ebe04037317d4b160ec diff --git a/DiligentTools b/DiligentTools index 0327aa9..24f5cad 160000 --- a/DiligentTools +++ b/DiligentTools @@ -1 +1 @@ -Subproject commit 0327aa91754b3161b9e535c1ffa780e4c4f03c66 +Subproject commit 24f5cad05bf20ae21bddcca54a941fec510e08cc diff --git a/appveyor.yml b/appveyor.yml index d65c32a..ba83070 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -65,7 +65,7 @@ before_build: - validate_format_win.bat - cd c:\projects\diligentengine - echo %PLATFORM% - - echo %cmake_args% + - echo.%cmake_args% - cmake -D DILIGENT_ENABLE_TESTS=TRUE %cmake_args% -S . -B ./build -G "Visual Studio 15 2017" -A %PLATFORM% build: -- cgit v1.2.3