diff options
| author | GregF <greg@LunarG.com> | 2016-04-01 14:20:14 -0600 |
|---|---|---|
| committer | GregF <greg@LunarG.com> | 2016-04-01 14:20:14 -0600 |
| commit | 4132e63a672a7977fe6732586cacb8f4e0243a42 (patch) | |
| tree | 84838cdfb0400149281df0a35bae9c7519bca3c3 | |
| parent | e8fe5a1307ee399fe7243ce6477e8d2efd2e4352 (diff) | |
| download | usermoji-4132e63a672a7977fe6732586cacb8f4e0243a42.tar.xz | |
SPIRV: Adjust to spirv-tools library move
| -rwxr-xr-x | CMakeLists.txt | 6 | ||||
| -rwxr-xr-x | update_external_sources.bat | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 66ca4760..35610fec 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -112,10 +112,10 @@ if (WIN32) "${CMAKE_SOURCE_DIR}/../glslang/${BUILDTGT_DIR}/glslang/OSDependent/Windows/Release" "${CMAKE_SOURCE_DIR}/../glslang/${BUILDTGT_DIR}/OGLCompilersDLL/Release" "${CMAKE_SOURCE_DIR}/../glslang/${BUILDTGT_DIR}/SPIRV/Release" ) - set (SPIRV_TOOLS_SEARCH_PATH "${CMAKE_SOURCE_DIR}/../spirv-tools/${BUILDTGT_DIR}/Release") + set (SPIRV_TOOLS_SEARCH_PATH "${CMAKE_SOURCE_DIR}/../spirv-tools/${BUILDTGT_DIR}/source/Release") else() set (GLSLANG_SEARCH_PATH "${CMAKE_SOURCE_DIR}/../glslang/build/install/lib" "${CMAKE_SOURCE_DIR}/../x86_64/lib/glslang" ) - set (SPIRV_TOOLS_SEARCH_PATH "${CMAKE_SOURCE_DIR}/../spirv-tools/build" "${CMAKE_SOURCE_DIR}/../x86_64/lib/spirv-tools" ) + set (SPIRV_TOOLS_SEARCH_PATH "${CMAKE_SOURCE_DIR}/../spirv-tools/build/source" "${CMAKE_SOURCE_DIR}/../x86_64/lib/spirv-tools" ) endif() find_library(GLSLANG_LIB NAMES glslang @@ -139,7 +139,7 @@ if (WIN32) "${CMAKE_SOURCE_DIR}/../glslang/${BUILDTGT_DIR}/glslang/OSDependent/Windows/Debug" "${CMAKE_SOURCE_DIR}/../glslang/${BUILDTGT_DIR}/OGLCompilersDLL/Debug" "${CMAKE_SOURCE_DIR}/../glslang/${BUILDTGT_DIR}/SPIRV/Debug") - set (SPIRV_TOOLS_DEBUG_SEARCH_PATH "${CMAKE_SOURCE_DIR}/../spirv-tools/${BUILDTGT_DIR}/Debug") + set (SPIRV_TOOLS_DEBUG_SEARCH_PATH "${CMAKE_SOURCE_DIR}/../spirv-tools/${BUILDTGT_DIR}/source/Debug") add_library(glslang STATIC IMPORTED) add_library(OGLCompiler STATIC IMPORTED) diff --git a/update_external_sources.bat b/update_external_sources.bat index cf81a82b..be2d8d41 100755 --- a/update_external_sources.bat +++ b/update_external_sources.bat @@ -337,7 +337,7 @@ goto:eof msbuild ALL_BUILD.vcxproj /p:Platform=x86 /p:Configuration=Debug /verbosity:quiet
REM Check for existence of one lib, even though we should check for all results
- if not exist %SPIRV_TOOLS_BUILD_DIR%\Debug\SPIRV-Tools.lib (
+ if not exist %SPIRV_TOOLS_BUILD_DIR%\source\Debug\SPIRV-Tools.lib (
echo.
echo spirv-tools 32-bit Debug build failed!
set errorCode=1
@@ -347,7 +347,7 @@ goto:eof msbuild ALL_BUILD.vcxproj /p:Platform=x86 /p:Configuration=Release /verbosity:quiet
REM Check for existence of one lib, even though we should check for all results
- if not exist %SPIRV_TOOLS_BUILD_DIR%\Release\SPIRV-Tools.lib (
+ if not exist %SPIRV_TOOLS_BUILD_DIR%\source\Release\SPIRV-Tools.lib (
echo.
echo spirv-tools 32-bit Release build failed!
set errorCode=1
@@ -368,7 +368,7 @@ goto:eof msbuild ALL_BUILD.vcxproj /p:Platform=x64 /p:Configuration=Debug /verbosity:quiet
REM Check for existence of one lib, even though we should check for all results
- if not exist %SPIRV_TOOLS_BUILD_DIR%\Debug\SPIRV-Tools.lib (
+ if not exist %SPIRV_TOOLS_BUILD_DIR%\source\Debug\SPIRV-Tools.lib (
echo.
echo spirv-tools 64-bit Debug build failed!
set errorCode=1
@@ -378,7 +378,7 @@ goto:eof msbuild ALL_BUILD.vcxproj /p:Platform=x64 /p:Configuration=Release /verbosity:quiet
REM Check for existence of one lib, even though we should check for all results
- if not exist %SPIRV_TOOLS_BUILD_DIR%\Release\SPIRV-Tools.lib (
+ if not exist %SPIRV_TOOLS_BUILD_DIR%\source\Release\SPIRV-Tools.lib (
echo.
echo spirv-tools 64-bit Release build failed!
set errorCode=1
|