fetch slang by CPM

K1ngst0m · Jan 29, 2024 · ecb477b · ecb477b
1 parent 8fe8272
commit ecb477b
Show file tree

Hide file tree

Showing 25 changed files with 13 additions and 13,146 deletions.
diff --git a/cmake/AphExternal.cmake b/cmake/AphExternal.cmake
@@ -46,6 +46,13 @@ CPMAddPackage(
       "MI_OVERRIDE ON"
 )
 
+CPMAddPackage(
+  NAME slang
+  URL https://github.com/shader-slang/slang/releases/download/v2024.0.0/slang-2024.0.0-linux-x86_64.tar.gz
+  VERSION 2024.0.0
+  DOWNLOAD_ONLY YES
+)
+
 CPMAddPackage(
   NAME spirv-cross
   GITHUB_REPOSITORY KhronosGroup/SPIRV-Cross
@@ -57,7 +64,6 @@ CPMAddPackage(
 
 add_subdirectory(${APH_EXTERNAL_DIR}/volk EXCLUDE_FROM_ALL)
 add_subdirectory(${APH_EXTERNAL_DIR}/imgui EXCLUDE_FROM_ALL)
-add_subdirectory(${APH_EXTERNAL_DIR}/slang EXCLUDE_FROM_ALL)
 
 # wsi backend
 set(VALID_WSI_BACKENDS Auto GLFW SDL2)

diff --git a/engine/resource/CMakeLists.txt b/engine/resource/CMakeLists.txt
@@ -3,10 +3,14 @@ add_library(resource STATIC ${API_RESOURCE_SRC})
 aph_compiler_options(resource)
 target_include_directories(resource PRIVATE
   ${APH_ENGINE_DIR}
-  ${APH_EXTERNAL_DIR}/slang
   ${APH_EXTERNAL_DIR}/tinyktx
   ${APH_EXTERNAL_DIR}/stb/include
   ${tinygltf_SOURCE_DIR}
+
+  ${slang_SOURCE_DIR}
 )
 
-target_link_libraries(resource PRIVATE slang aph_filesystem common api)
+target_link_libraries(resource PRIVATE aph_filesystem common api)
+target_link_libraries(resource PRIVATE
+  ${slang_SOURCE_DIR}/bin/linux-x64/release/libslang.so
+)
diff --git a/external/slang/CMakeLists.txt b/external/slang/CMakeLists.txt
diff --git a/external/slang/LICENSE b/external/slang/LICENSE
diff --git a/external/slang/bin/linux-x64/release/libgfx.so b/external/slang/bin/linux-x64/release/libgfx.so
diff --git a/external/slang/bin/linux-x64/release/libslang-glslang.so b/external/slang/bin/linux-x64/release/libslang-glslang.so
diff --git a/external/slang/bin/linux-x64/release/libslang-llvm.so b/external/slang/bin/linux-x64/release/libslang-llvm.so
diff --git a/external/slang/bin/linux-x64/release/libslang.so b/external/slang/bin/linux-x64/release/libslang.so
diff --git a/external/slang/bin/linux-x64/release/slangc b/external/slang/bin/linux-x64/release/slangc
diff --git a/external/slang/bin/linux-x64/release/slangd b/external/slang/bin/linux-x64/release/slangd
diff --git a/external/slang/prelude/slang-cpp-host-prelude.h b/external/slang/prelude/slang-cpp-host-prelude.h