From ec8d9698e9de425e10a441015ec19e1675d54ced Mon Sep 17 00:00:00 2001 From: Sascha Willems Date: Fri, 5 Jun 2020 21:11:28 +0200 Subject: [PATCH] Add HLSL shaders to project file GLSL and HLSL shaders get their own folders per sample in the project structure --- examples/CMakeLists.txt | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index b8a6faff..a77ad4b1 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -18,14 +18,17 @@ 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/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}) + set(SHADER_DIR_GLSL "../data/shaders/glsl/${EXAMPLE_NAME}") + file(GLOB SHADERS_GLSL "${SHADER_DIR_GLSL}/*.vert" "${SHADER_DIR_GLSL}/*.frag" "${SHADER_DIR_GLSL}/*.comp" "${SHADER_DIR_GLSL}/*.geom" "${SHADER_DIR_GLSL}/*.tesc" "${SHADER_DIR_GLSL}/*.tese" "${SHADER_DIR_GLSL}/*.mesh" "${SHADER_DIR_GLSL}/*.task" "${SHADER_DIR_GLSL}/*.rgen" "${SHADER_DIR_GLSL}/*.rchit" "${SHADER_DIR_GLSL}/*.rmiss") + set(SHADER_DIR_HLSL "../data/shaders/hlsl/${EXAMPLE_NAME}") + file(GLOB SHADERS_HLSL "${SHADER_DIR_HLSL}/*.vert" "${SHADER_DIR_HLSL}/*.frag" "${SHADER_DIR_HLSL}/*.comp" "${SHADER_DIR_HLSL}/*.geom" "${SHADER_DIR_HLSL}/*.tesc" "${SHADER_DIR_HLSL}/*.tese" "${SHADER_DIR_HLSL}/*.mesh" "${SHADER_DIR_HLSL}/*.task" "${SHADER_DIR_HLSL}/*.rgen" "${SHADER_DIR_HLSL}/*.rchit" "${SHADER_DIR_HLSL}/*.rmiss") + source_group("Shaders\\GLSL" FILES ${SHADERS_GLSL}) + source_group("Shaders\\HLSL" FILES ${SHADERS_HLSL}) if(WIN32) - add_executable(${EXAMPLE_NAME} WIN32 ${MAIN_CPP} ${SOURCE} ${SHADERS}) + add_executable(${EXAMPLE_NAME} WIN32 ${MAIN_CPP} ${SOURCE} ${SHADERS_GLSL} ${SHADERS_HLSL}) target_link_libraries(${EXAMPLE_NAME} base ${Vulkan_LIBRARY} ${ASSIMP_LIBRARIES} ${WINLIBS}) else(WIN32) - add_executable(${EXAMPLE_NAME} ${MAIN_CPP} ${SOURCE} ${SHADERS}) + add_executable(${EXAMPLE_NAME} ${MAIN_CPP} ${SOURCE} ${SHADERS_GLSL} ${SHADERS_HLSL}) target_link_libraries(${EXAMPLE_NAME} base ) endif(WIN32)