diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2019-11-27 05:29:22 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2019-11-27 05:29:22 +0000 |
| commit | feb77c8a1c348cff72de33ba4784fee543284e65 (patch) | |
| tree | f548f23787800257161245f8bf84dcb0d4a42277 | |
| parent | Updated submodules & appveyor script (diff) | |
| download | DiligentEngine-feb77c8a1c348cff72de33ba4784fee543284e65.tar.gz DiligentEngine-feb77c8a1c348cff72de33ba4784fee543284e65.zip | |
Updated travis and appveyor build scripts
| -rw-r--r-- | .travis.yml | 18 | ||||
| m--------- | DiligentCore | 0 | ||||
| m--------- | DiligentTools | 0 | ||||
| -rw-r--r-- | appveyor.yml | 2 |
4 files changed, 11 insertions, 9 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 -Subproject d45d86e47888ac7269d4f07d41305981618cc4d +Subproject 9d048a635129f31b06ef8ebe04037317d4b160e diff --git a/DiligentTools b/DiligentTools -Subproject 0327aa91754b3161b9e535c1ffa780e4c4f03c6 +Subproject 24f5cad05bf20ae21bddcca54a941fec510e08c 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: |