Merge branch 'master' into hlsl-frontend
This commit is contained in:
commit
1c7e70763b
66 changed files with 3048 additions and 588 deletions
|
|
@ -1,5 +1,13 @@
|
|||
cmake_minimum_required(VERSION 2.8)
|
||||
|
||||
add_library(glslang-default-resource-limits
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/DefaultResourceLimits.cpp
|
||||
)
|
||||
target_include_directories(glslang-default-resource-limits
|
||||
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
|
||||
PUBLIC ${PROJECT_SOURCE_DIR}
|
||||
)
|
||||
|
||||
set(SOURCES StandAlone.cpp)
|
||||
set(REMAPPER_SOURCES spirv-remap.cpp)
|
||||
|
||||
|
|
@ -11,7 +19,8 @@ set(LIBRARIES
|
|||
OGLCompiler
|
||||
OSDependent
|
||||
HLSL
|
||||
SPIRV)
|
||||
SPIRV
|
||||
glslang-default-resource-limits)
|
||||
|
||||
if(WIN32)
|
||||
set(LIBRARIES ${LIBRARIES} psapi)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue