Merge branch 'master' of ssh://git.axiodl.com:6431/AxioDL/hecl

This commit is contained in:
Jack Andersen 2019-10-12 18:54:33 -10:00
commit 3506ee1796
1 changed files with 0 additions and 2 deletions

View File

@ -52,7 +52,6 @@ function(add_shader file)
add_stage_rep(shader_${name} ${CMAKE_CURRENT_BINARY_DIR}/${dir}/shader_${name}.hpp) add_stage_rep(shader_${name} ${CMAKE_CURRENT_BINARY_DIR}/${dir}/shader_${name}.hpp)
add_pipeline_rep(shader_${name} ${CMAKE_CURRENT_BINARY_DIR}/${dir}/shader_${name}.hpp UNIVERSAL) add_pipeline_rep(shader_${name} ${CMAKE_CURRENT_BINARY_DIR}/${dir}/shader_${name}.hpp UNIVERSAL)
add_library(shader_${name} ${CMAKE_CURRENT_BINARY_DIR}/${dir}/shader_${name}.hpp ${CMAKE_CURRENT_BINARY_DIR}/${dir}/shader_${name}.cpp) add_library(shader_${name} ${CMAKE_CURRENT_BINARY_DIR}/${dir}/shader_${name}.hpp ${CMAKE_CURRENT_BINARY_DIR}/${dir}/shader_${name}.cpp)
target_link_libraries(shader_${name} PUBLIC boo hecl-light)
add_shader_target(shader_${name}) add_shader_target(shader_${name})
endfunction() endfunction()
@ -60,6 +59,5 @@ function(add_special_shader name)
add_stage_rep(${name} ${name}.hpp) add_stage_rep(${name} ${name}.hpp)
add_pipeline_rep(${name} ${name}.hpp UNIVERSAL) add_pipeline_rep(${name} ${name}.hpp UNIVERSAL)
add_library(${name} ${name}.hpp ${ARGN}) add_library(${name} ${name}.hpp ${ARGN})
target_link_libraries(${name} PUBLIC boo hecl-light)
add_shader_target(${name}) add_shader_target(${name})
endfunction() endfunction()