Experiment a bit more with Travis.
It's hanging for some reason on OSX build of spirv-tools.
This commit is contained in:
Родитель
5a746ba941
Коммит
1a4a36b6cd
|
@ -13,6 +13,6 @@ before_script:
|
|||
- ./checkout_glslang_spirv_tools.sh
|
||||
|
||||
script:
|
||||
- ./build_glslang_spirv_tools.sh
|
||||
- ./build_glslang_spirv_tools.sh Release 2
|
||||
- make -j2
|
||||
- ./test_shaders.sh
|
||||
|
|
|
@ -1,16 +1,26 @@
|
|||
#!/bin/bash
|
||||
|
||||
PROFILE=Release
|
||||
if [ ! -z $1 ]; then
|
||||
PROFILE=$1
|
||||
fi
|
||||
|
||||
NPROC=$(nproc)
|
||||
if [ ! -z $2 ]; then
|
||||
NPROC=$2
|
||||
fi
|
||||
|
||||
echo "Building glslang."
|
||||
mkdir -p external/glslang-build
|
||||
cd external/glslang-build
|
||||
cmake ../glslang -DCMAKE_BUILD_TYPE=Release -G"Unix Makefiles"
|
||||
make -j$(nproc)
|
||||
cmake ../glslang -DCMAKE_BUILD_TYPE=$PROFILE -G"Unix Makefiles"
|
||||
make -j$NPROC
|
||||
cd ../..
|
||||
|
||||
echo "Building SPIRV-Tools."
|
||||
mkdir -p external/spirv-tools-build
|
||||
cd external/spirv-tools-build
|
||||
cmake ../spirv-tools -DCMAKE_BUILD_TYPE=Release -G"Unix Makefiles"
|
||||
make -j$(nproc)
|
||||
cmake ../spirv-tools -DCMAKE_BUILD_TYPE=$PROFILE -G"Unix Makefiles"
|
||||
make -j$NPROC
|
||||
cd ../..
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче