aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Ashburn <jon@lunarg.com>2016-01-31 10:22:36 -0700
committerJon Ashburn <jon@lunarg.com>2016-01-31 10:22:36 -0700
commit443d9f19d0e1d00440a626c61cd23e9b8a46288d (patch)
tree31897fa5967e2dafa8b0ce07a81d99d5a086c54c
parent29357d312d2f5581a516552e036f689a1bebe600 (diff)
downloadusermoji-443d9f19d0e1d00440a626c61cd23e9b8a46288d.tar.xz
Revert "misc: Change repo name references to LoaderAndValidationLayers"
This reverts commit 015e74cda0b9ad46bd6127d816f14d699697ec4a.
-rw-r--r--BUILD.md8
-rw-r--r--build_windows_targets.bat22
-rw-r--r--windowsRuntimeInstaller/README.txt2
3 files changed, 16 insertions, 16 deletions
diff --git a/BUILD.md b/BUILD.md
index 038b5af4..dcd08008 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -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/LoaderAndValidationLayers.git .
-# Or substitute the URL from your forked repo for git@gitlab.khronos.org:vulkan/LoaderAndValidationLayers.git above.
+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.
```
## 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 LoaderAndValidationLayers # cd to the root of the Vulkan git repository
+cd LoaderAndTools # 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 LoaderAndValidationLayers # cd to the root of the Vulkan git repository
+cd LoaderAndTools # 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 66c88789..6a3bba24 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 LoaderAndValidationLayers build
+REM 64-bit LoaderAndTools 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 LoaderAndValidationLayers
+echo Building 64-bit Debug LoaderAndTools
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 LoaderAndValidationLayers 64-bit Debug build failed!
+ echo LoaderAndTools 64-bit Debug build failed!
set errorCode=1
)
-echo Building 64-bit Release LoaderAndValidationLayers
+echo Building 64-bit Release LoaderAndTools
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 LoaderAndValidationLayers 64-bit Release build failed!
+ echo LoaderAndTools 64-bit Release build failed!
set errorCode=1
)
popd
REM *******************************************
-REM 32-bit LoaderAndValidationLayers build
+REM 32-bit LoaderAndTools build
REM *******************************************
mkdir build32
pushd build32
-echo Generating 32-bit LoaderAndValidationLayers CMake files for Visual Studio %VS_VERSION%
+echo Generating 32-bit LoaderAndTools CMake files for Visual Studio %VS_VERSION%
cmake -G "Visual Studio %VS_VERSION%" ..
-echo Building 32-bit Debug LoaderAndValidationLayers
+echo Building 32-bit Debug LoaderAndTools
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 LoaderAndValidationLayers 32-bit Debug build failed!
+ echo LoaderAndTools 32-bit Debug build failed!
set errorCode=1
)
-echo Building 32-bit Release LoaderAndValidationLayers
+echo Building 32-bit Release LoaderAndTools
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 LoaderAndValidationLayers 32-bit Release build failed!
+ echo LoaderAndTools 32-bit Release build failed!
set errorCode=1
)
diff --git a/windowsRuntimeInstaller/README.txt b/windowsRuntimeInstaller/README.txt
index 95201887..b8cf2d37 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 LoaderAndValidationLayers as described in ../BUILD.md.
+ 2. Build Vulkan LoaderAndTools 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: