diff options
| -rw-r--r-- | BUILD.md | 8 | ||||
| -rw-r--r-- | build_windows_targets.bat | 22 | ||||
| -rw-r--r-- | windowsRuntimeInstaller/README.txt | 2 |
3 files changed, 16 insertions, 16 deletions
@@ -244,8 +244,8 @@ To create your local git repository: ``` mkdir YOUR_DEV_DIRECTORY # it's called GL-Next on Github, but the name doesn't matter cd YOUR_DEV_DIRECTORY -git clone -o khronos git@gitlab.khronos.org:vulkan/LoaderAndTools.git . -# Or substitute the URL from your forked repo for git@gitlab.khronos.org:vulkan/LoaderAndTools.git above. +git clone -o khronos git@gitlab.khronos.org:vulkan/LoaderAndValidationLayers.git . +# Or substitute the URL from your forked repo for git@gitlab.khronos.org:vulkan/LoaderAndValidationLayers.git above. ``` ## Linux Build @@ -357,7 +357,7 @@ Cygwin is used in order to obtain a local copy of the Git repository, and to run Example debug x64 build (e.g. in a "Developer Command Prompt for VS2013" window): ``` -cd LoaderAndTools # cd to the root of the Vulkan git repository +cd LoaderAndValidationLayers # cd to the root of the Vulkan git repository update_external_sources.bat --all mkdir build cd build @@ -381,7 +381,7 @@ If you plan on creating a Windows Install file (done in the windowsRuntimeInstal To do this, simply create and build the release versions of each target: ``` -cd LoaderAndTools # cd to the root of the Vulkan git repository +cd LoaderAndValidationLayers # cd to the root of the Vulkan git repository update_external_sources.bat --all mkdir build cd build diff --git a/build_windows_targets.bat b/build_windows_targets.bat index 6a3bba24..66c88789 100644 --- a/build_windows_targets.bat +++ b/build_windows_targets.bat @@ -18,7 +18,7 @@ rmdir /Q /S build rmdir /Q /S build32 REM ******************************************* -REM 64-bit LoaderAndTools build +REM 64-bit LoaderAndValidationLayers build REM ******************************************* mkdir build pushd build @@ -26,54 +26,54 @@ pushd build echo Generating 64-bit spirv-tools CMake files for Visual Studio %VS_VERSION% cmake -G "Visual Studio %VS_VERSION% Win64" .. -echo Building 64-bit Debug LoaderAndTools +echo Building 64-bit Debug LoaderAndValidationLayers msbuild ALL_BUILD.vcxproj /p:Platform=x64 /p:Configuration=Debug REM Check for existence of one DLL, even though we should check for all results if not exist .\loader\Debug\vulkan-1.dll ( echo. - echo LoaderAndTools 64-bit Debug build failed! + echo LoaderAndValidationLayers 64-bit Debug build failed! set errorCode=1 ) -echo Building 64-bit Release LoaderAndTools +echo Building 64-bit Release LoaderAndValidationLayers msbuild ALL_BUILD.vcxproj /p:Platform=x64 /p:Configuration=Release REM Check for existence of one DLL, even though we should check for all results if not exist .\loader\Release\vulkan-1.dll ( echo. - echo LoaderAndTools 64-bit Release build failed! + echo LoaderAndValidationLayers 64-bit Release build failed! set errorCode=1 ) popd REM ******************************************* -REM 32-bit LoaderAndTools build +REM 32-bit LoaderAndValidationLayers build REM ******************************************* mkdir build32 pushd build32 -echo Generating 32-bit LoaderAndTools CMake files for Visual Studio %VS_VERSION% +echo Generating 32-bit LoaderAndValidationLayers CMake files for Visual Studio %VS_VERSION% cmake -G "Visual Studio %VS_VERSION%" .. -echo Building 32-bit Debug LoaderAndTools +echo Building 32-bit Debug LoaderAndValidationLayers msbuild ALL_BUILD.vcxproj /p:Platform=x86 /p:Configuration=Debug REM Check for existence of one DLL, even though we should check for all results if not exist .\loader\Debug\vulkan-1.dll ( echo. - echo LoaderAndTools 32-bit Debug build failed! + echo LoaderAndValidationLayers 32-bit Debug build failed! set errorCode=1 ) -echo Building 32-bit Release LoaderAndTools +echo Building 32-bit Release LoaderAndValidationLayers msbuild ALL_BUILD.vcxproj /p:Platform=x86 /p:Configuration=Release REM Check for existence of one DLL, even though we should check for all results if not exist .\loader\Release\vulkan-1.dll ( echo. - echo LoaderAndTools 32-bit Release build failed! + echo LoaderAndValidationLayers 32-bit Release build failed! set errorCode=1 ) diff --git a/windowsRuntimeInstaller/README.txt b/windowsRuntimeInstaller/README.txt index b8cf2d37..95201887 100644 --- a/windowsRuntimeInstaller/README.txt +++ b/windowsRuntimeInstaller/README.txt @@ -6,7 +6,7 @@ To build the Installer: 1. Install Nullsoft Install System version 3.0b1 or greater. (Available from
http://nsis.sourceforge.net/Download.)
- 2. Build Vulkan LoaderAndTools as described in ../BUILD.md.
+ 2. Build Vulkan LoaderAndValidationLayers as described in ../BUILD.md.
3. Edit the InstallerRT.nsi file in this folder and modify the following lines
to match the version of the Windows Vulkan Runtime you wish to build:
|