Merge branch 'master' into gltfskinning

This commit is contained in:
Sascha Willems 2020-06-05 20:58:10 +02:00
commit d4f7b3cc86
1334 changed files with 1239 additions and 1214 deletions

View file

@ -18,7 +18,7 @@ function(buildExample EXAMPLE_NAME)
SET(SOURCE ${SOURCE} ${CMAKE_BINARY_DIR}/xdg-shell-client-protocol.h ${CMAKE_BINARY_DIR}/xdg-shell-protocol.c)
ENDIF()
# Add shaders
set(SHADER_DIR "../data/shaders/${EXAMPLE_NAME}")
set(SHADER_DIR "../data/shaders/glsl/${EXAMPLE_NAME}")
file(GLOB SHADERS "${SHADER_DIR}/*.vert" "${SHADER_DIR}/*.frag" "${SHADER_DIR}/*.comp" "${SHADER_DIR}/*.geom" "${SHADER_DIR}/*.tesc" "${SHADER_DIR}/*.tese" "${SHADER_DIR}/*.mesh" "${SHADER_DIR}/*.task" "${SHADER_DIR}/*.rgen" "${SHADER_DIR}/*.rchit" "${SHADER_DIR}/*.rmiss")
source_group("Shaders" FILES ${SHADERS})
if(WIN32)