diff --git a/.travis.yml b/.travis.yml index 14032e7e9..0a85adac3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/build_glslang_spirv_tools.sh b/build_glslang_spirv_tools.sh index 953705070..67480896c 100755 --- a/build_glslang_spirv_tools.sh +++ b/build_glslang_spirv_tools.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 ../..