diff options
| -rw-r--r-- | .github/workflows/linux.yml (renamed from .github/workflows/c-cpp.yml) | 2 | ||||
| -rw-r--r-- | deps/target-deps.json | 10 | ||||
| m--------- | external/slang-binaries | 0 | ||||
| -rw-r--r-- | premake5.lua | 29 |
4 files changed, 13 insertions, 28 deletions
diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/linux.yml index e848b8170..d9d0a7b66 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/linux.yml @@ -1,4 +1,4 @@ -name: C/C++ CI +name: Linux Build CI on: push: diff --git a/deps/target-deps.json b/deps/target-deps.json index 3f43fe662..1b7a61f55 100644 --- a/deps/target-deps.json +++ b/deps/target-deps.json @@ -4,14 +4,14 @@ "dependencies" : [ { "name" : "slang-llvm", - "baseUrl" : "https://github.com/shader-slang/slang-llvm/releases/download/v13.x-22/", + "baseUrl" : "https://github.com/shader-slang/slang-llvm/releases/download/v13.x-27/", "optional" : true, "packages" : { - "windows-x86_64" : { "type" : "url", "path" : "slang-llvm-13.x-22-win64.zip" }, - "windows-x86" : { "type": "url", "path" : "slang-llvm-13.x-22-win32.zip" }, - "linux-x86_64" : { "type": "url", "path" : "slang-llvm-v13.x-22-linux-x86_64-release.zip" }, - "macosx-x86_64" : { "type": "url", "path" : "slang-llvm-v13.x-22-macosx-x86_64-release.zip" } + "windows-x86_64" : { "type" : "url", "path" : "slang-llvm-13.x-27-win64.zip" }, + "windows-x86" : { "type": "url", "path" : "slang-llvm-13.x-27-win32.zip" }, + "linux-x86_64" : { "type": "url", "path" : "slang-llvm-v13.x-27-linux-x86_64-release.zip" }, + "macosx-x86_64" : { "type": "url", "path" : "slang-llvm-v13.x-27-macosx-x86_64-release.zip" } } }, { diff --git a/external/slang-binaries b/external/slang-binaries -Subproject 8324a9309a60a8f9472abd0ce91f6122c640453 +Subproject d5d689343969ba752f921f57f59f68806ea93c2 diff --git a/premake5.lua b/premake5.lua index cbe062617..d5a9d102a 100644 --- a/premake5.lua +++ b/premake5.lua @@ -1333,36 +1333,21 @@ newoption { local slangLLVMPath = deps:getProjectRelativePath("slang-llvm", "../../..") if slangLLVMPath then - - filter { "system:windows" } - postbuildcommands { - "{COPY} " .. slangLLVMPath .."/bin/" .. targetName .. "/release/slang-llvm.dll %{cfg.targetdir}" - } - - filter { "system:linux" } + filter { "system:linux or macosx or windows" } + local sharedLibName = slangUtil.getSharedLibraryFileName(targetInfo, "slang-llvm") postbuildcommands { - "{COPY} " .. slangLLVMPath .. "/bin/" .. targetName .. "/release/libslang-llvm.so %{cfg.targetdir}" + "{COPY} " .. slangLLVMPath .."/bin/" .. targetName .. "/release/" .. sharedLibName .. " %{cfg.targetdir}" } end -- If we are not building glslang from source, then be -- sure to copy a binary copy over to the output directory if not buildGlslang then - filter { "system:windows" } - postbuildcommands { - "{COPY} ../../../external/slang-binaries/bin/" .. targetName .. "/slang-glslang.dll %{cfg.targetdir}" - } - - filter { "system:linux" } - postbuildcommands { - "{COPY} ../../../external/slang-binaries/bin/" .. targetName .. "/libslang-glslang.so %{cfg.targetdir}" - } - - filter { "system:macosx" } + filter { "system:linux or macosx or windows" } + local sharedLibName = slangUtil.getSharedLibraryFileName(targetInfo, "slang-glslang") postbuildcommands { - "{COPY} ../../../external/slang-binaries/bin/" .. targetName .. "/libslang-glslang.dylib %{cfg.targetdir}" - } - + "{COPY} ../../../external/slang-binaries/bin/" .. targetName .. "/" .. sharedLibName .. " %{cfg.targetdir}" + } end filter {"configurations:debug"} |