Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Johannes van Waveren
2016-06-27 22:05:17 -05:00
129 changed files with 20289 additions and 3652 deletions

View File

@@ -15,6 +15,8 @@ add_executable(glslangValidator ${SOURCES})
add_executable(spirv-remap ${REMAPPER_SOURCES})
set_property(TARGET glslangValidator PROPERTY FOLDER tools)
set_property(TARGET spirv-remap PROPERTY FOLDER tools)
glslang_set_link_args(glslangValidator)
glslang_set_link_args(spirv-remap)
set(LIBRARIES
glslang