summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorassiduous <assiduous@diligentgraphics.com>2020-04-08 03:57:31 +0000
committerassiduous <assiduous@diligentgraphics.com>2020-04-08 03:57:31 +0000
commit2c96ecb9718d42f0a4a37b2059f8af4a4e241915 (patch)
tree15f2cb1b29775f56e2d7ed985b2148c03af089f3
parentUpdated tools and samples (diff)
downloadDiligentEngine-2c96ecb9718d42f0a4a37b2059f8af4a4e241915.tar.gz
DiligentEngine-2c96ecb9718d42f0a4a37b2059f8af4a4e241915.zip
Updated tools and samples (refactored PNG and JPEG image loading)
-rw-r--r--.travis.yml2
m---------DiligentSamples0
m---------DiligentTools0
-rw-r--r--appveyor.yml2
4 files changed, 4 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index b62bdbc..d4d0f5c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -68,3 +68,5 @@ script:
- . ./DiligentCore/BuildTools/Scripts/travis/build.sh "-DDILIGENT_BUILD_TESTS=TRUE"
- cd ../DiligentCore/Tests/DiligentCoreAPITest/assets
- . ../../../BuildTools/Scripts/travis/run_tests.sh ../../../../build/DiligentCore
+ - cd ../../../../DiligentTools/Tests/DiligentToolsTest/assets
+ - . ../../../BuildTools/Scripts/travis/run_tests.sh ../../../../build/DiligentTools
diff --git a/DiligentSamples b/DiligentSamples
-Subproject 72b02e88482a9a91d9346241893b28f18c82225
+Subproject b88f24dcedc8227a9593b7441259a055d92e0e4
diff --git a/DiligentTools b/DiligentTools
-Subproject 55957e1c645f825c07969e0065abe2db151cef5
+Subproject a443255ac6ea8057c4deb6d1fd804b724a31c2f
diff --git a/appveyor.yml b/appveyor.yml
index d4ab4fc..bd54939 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -83,5 +83,7 @@ build:
test_script:
- 'cd %APPVEYOR_BUILD_FOLDER%\DiligentCore\Tests\DiligentCoreAPITest\assets'
- '%APPVEYOR_BUILD_FOLDER%\DiligentCore\BuildTools\Scripts\appveyor\run_tests.bat %APPVEYOR_BUILD_FOLDER%\build\DiligentCore'
+ - 'cd %APPVEYOR_BUILD_FOLDER%\DiligentTools\Tests\DiligentToolsTest\assets'
+ - '%APPVEYOR_BUILD_FOLDER%\DiligentTools\BuildTools\Scripts\appveyor\run_tests.bat %APPVEYOR_BUILD_FOLDER%\build\DiligentTools'
- 'cd %APPVEYOR_BUILD_FOLDER%\DiligentSamples\Tests\GoldenImages'
- '%APPVEYOR_BUILD_FOLDER%\DiligentSamples\BuildTools\Scripts\appveyor\run_tests.bat %APPVEYOR_BUILD_FOLDER%\build compare'