- if %PLATFORM% == x64 (set GENERATOR="Visual Studio %VS_VERSION% Win64")
- if %PLATFORM% == Win32 (set BUILD_DIR="build32")
- if %PLATFORM% == x64 (set BUILD_DIR="build")
+ # Build Vulkan-Headers
+ - echo Building Vulkan-Headers for %PLATFORM% %CONFIGURATION%
+ - cd %APPVEYOR_BUILD_FOLDER%
+ # Need different name here until Vulkan-Tools stops having Vulkan-Headers as a submodule.
+ - git clone https://github.com/KhronosGroup/Vulkan-Headers.git Vulkan-Headers-TMP
+ - cd Vulkan-Headers-TMP
+ - mkdir %BUILD_DIR%
+ - cd %BUILD_DIR%
+ - cmake -G %GENERATOR% -DCMAKE_INSTALL_PREFIX=install ..
+ - cmake --build . --config %CONFIGURATION% --target install -- /maxcpucount
# Build Vulkan-Loader
- echo Building Vulkan-Loader for %PLATFORM% %CONFIGURATION%
- cd %APPVEYOR_BUILD_FOLDER%
- - git clone --recurse-submodules https://github.com/KhronosGroup/Vulkan-Loader.git
+ - git clone https://github.com/KhronosGroup/Vulkan-Loader.git
- cd Vulkan-Loader
- mkdir %BUILD_DIR%
- cd %BUILD_DIR%
- - cmake -G %GENERATOR% ..
+ - cmake -G %GENERATOR% -DVULKAN_HEADERS_INSTALL_DIR=%APPVEYOR_BUILD_FOLDER%/Vulkan-Headers-TMP/%BUILD_DIR%/install ..
- cmake --build . --config %CONFIGURATION% -- /maxcpucount
# Generate build files using CMake for the build step.
- echo Generating Vulkan-Tools CMake files for %PLATFORM% %CONFIGURATION%
script:
- set -e
+ if [[ "$VULKAN_BUILD_TARGET" == "LINUX" ]]; then
+ # Build Vulkan-Headers
+ cd ${TRAVIS_BUILD_DIR}
+ # Need different name here until Vulkan-Tools stops having Vulkan-Headers as a submodule.
+ git clone https://github.com/KhronosGroup/Vulkan-Headers.git Vulkan-Headers-TMP
+ cd Vulkan-Headers-TMP
+ mkdir build
+ cd build
+ cmake -DCMAKE_INSTALL_PREFIX=install ..
+ make -j $core_count install
+ cd ${TRAVIS_BUILD_DIR}
+ fi
- |
if [[ "$VULKAN_BUILD_TARGET" == "LINUX" ]]; then
# Build Vulkan-Loader for Vulkan-Tools
cd ${TRAVIS_BUILD_DIR}
- git clone --recurse-submodules https://github.com/KhronosGroup/Vulkan-Loader.git
+ git clone https://github.com/KhronosGroup/Vulkan-Loader.git
cd Vulkan-Loader
mkdir build
cd build
- cmake -DCMAKE_BUILD_TYPE=Debug ..
- make -j $core_count
+ cmake -DCMAKE_BUILD_TYPE=Debug -DVULKAN_HEADERS_INSTALL_DIR=${TRAVIS_BUILD_DIR}/Vulkan-Headers-TMP/build/install -DCMAKE_INSTALL_PREFIX=install ..
+ make -j $core_count install
cd ${TRAVIS_BUILD_DIR}
fi
- |