From 35663cd3c457ba74f02b27cf79c9052e6a9a72c9 Mon Sep 17 00:00:00 2001 From: Light Date: Sun, 12 Sep 2021 16:56:33 +0430 Subject: [PATCH] Added ShaderConductor --- .gitmodules | 3 +++ CMakeLists.txt | 4 ++++ Dependencies/ShaderConductor | 1 + 3 files changed, 8 insertions(+) create mode 160000 Dependencies/ShaderConductor diff --git a/.gitmodules b/.gitmodules index 6db21f8..28d057a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,3 +13,6 @@ [submodule "Dependencies/entt"] path = Dependencies/entt url = https://github.com/skypjack/entt +[submodule "Dependencies/ShaderConductor"] + path = Dependencies/ShaderConductor + url = https://github.com/microsoft/shaderconductor diff --git a/CMakeLists.txt b/CMakeLists.txt index e8d4ce6..b11f3aa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,10 @@ cmake_minimum_required(VERSION 3.21.2) project(Light VERSION 1.0.0) +add_subdirectory(Dependencies/ShaderConductor) + set(CMAKE_CXX_STANDARD 17) + # target_compile_features(Light PUBLIC cxx_std_17) # set_property(TARGET Light CXX_STANDARD 17) @@ -32,6 +35,7 @@ target_link_libraries(Engine glfw) target_link_libraries(Engine spdlog) target_link_libraries(Engine imgui) target_link_libraries(Engine stb_image) +target_link_libraries(Engine ShaderConductor) target_link_libraries(imgui glad) target_link_libraries(imgui glfw) diff --git a/Dependencies/ShaderConductor b/Dependencies/ShaderConductor new file mode 160000 index 0000000..30a77c7 --- /dev/null +++ b/Dependencies/ShaderConductor @@ -0,0 +1 @@ +Subproject commit 30a77c78d24fa08f4fe5fc4428f10dbfc92717a6