diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5039b4b..9cf720b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,8 +48,15 @@ if(IOS)
     add_executable(openVulkanoCpp examples/main.m ${resources})
 else()
     file(GLOB_RECURSE sources CONFIGURE_DEPENDS "openVulkanoCpp/*.h" "openVulkanoCpp/*.c" "openVulkanoCpp/*.hpp" "openVulkanoCpp/*.cpp" "examples/*.hpp" "examples/*.cpp")
-    add_executable(openVulkanoCpp examples/main.cpp)
+    file(GLOB SHADER_SRC_FILES ${ROOT_FOLDER}/openVulkanoCpp/Shader/*)
+    list(FILTER SHADER_SRC_FILES EXCLUDE REGEX ".*\\.(hpp|cpp)$")
+    add_executable(openVulkanoCpp examples/main.cpp ${SHADER_SRC_FILES})
+    if (MSVC)
+        set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+        source_group("Shaders" FILES ${SHADER_SRC_FILES})
+    endif()
 endif()
+
 FilterPlatformPaths(sources)
 SetWarningSettings(openVulkanoCpp)
 set_property(TARGET openVulkanoCpp PROPERTY CXX_STANDARD 20)