Skip to content

Commit

Permalink
fix dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Glavnokoman committed Jul 4, 2018
1 parent 15af7db commit d67bea2
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ language: cpp
dist: trusty
sudo: required

branches:
- /master/
# branches:
# - /master/
# except:
# - /dev-appveyor.*/

Expand Down
12 changes: 7 additions & 5 deletions config/install_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,17 @@

cget init --std=c++14

cget install KhronosGroup/Vulkan-Headers
# cget install KhronosGroup/Vulkan-Headers

https://github.com/Glavnokoman/Vulkan-Loader.git
# https://github.com/Glavnokoman/Vulkan-Loader.git
git clone --branch sdk-1.1.77.0 --depth 1 --recurse-submodules https://github.com/KhronosGroup/Vulkan-Headers.git ${CGET_PREFIX}/src/vulkan-headers
cget install ${CGET_PREFIX}/src/vulkan-headers

git clone --recurse-submodules -b fix_find_vulkan_headers https://github.com/Glavnokoman/Vulkan-Loader.git ${CGET_PREFIX}/src/vulkan-loader
# git clone --recurse-submodules https://github.com/KhronosGroup/Vulkan-Loader ${CGET_PREFIX}/src/vulkan-loader
#git clone --recurse-submodules -b fix_find_vulkan_headers https://github.com/Glavnokoman/Vulkan-Loader.git ${CGET_PREFIX}/src/vulkan-loader
git clone --branch sdk-1.1.77.0 --depth 1 --recurse-submodules https://github.com/KhronosGroup/Vulkan-Loader ${CGET_PREFIX}/src/vulkan-loader
cget install ${CGET_PREFIX}/src/vulkan-loader -DBUILD_WSI_WAYLAND_SUPPORT=OFF -DBUILD_TESTS=OFF

git clone --recurse-submodules https://github.com/KhronosGroup/glslang.git ${CGET_PREFIX}/src/glslang
git clone --branch 6.2.2596 --depth 1 --recurse-submodules https://github.com/KhronosGroup/glslang.git ${CGET_PREFIX}/src/glslang
cget install ${CGET_PREFIX}/src/glslang -DENABLE_HLSL=OFF -DENABLE_AMD_EXTENSIONS=OFF -DENABLE_NV_EXTENSIONS=OFF -DENABLE_OPT=OFF

cget install catchorg/Catch2@v2.2.2 -DNO_SELFTEST=ON

0 comments on commit d67bea2

Please sign in to comment.