From 6171125d216439afa3269f5ec4408ae706208e51 Mon Sep 17 00:00:00 2001 From: SirLynix Date: Wed, 6 Apr 2022 12:49:34 +0200 Subject: [PATCH] nzslc fixes --- .github/workflows/msys2-build.yml | 2 +- tools/nzslc.lua | 23 ++++++++++++----------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.github/workflows/msys2-build.yml b/.github/workflows/msys2-build.yml index 6dacebbf3..75ebc8987 100644 --- a/.github/workflows/msys2-build.yml +++ b/.github/workflows/msys2-build.yml @@ -78,7 +78,7 @@ jobs: # Build the engine - name: Build Nazara - run: xmake + run: xmake -v # Run unit tests - name: Run unit tests diff --git a/tools/nzslc.lua b/tools/nzslc.lua index c8c860f78..a10a5ca26 100644 --- a/tools/nzslc.lua +++ b/tools/nzslc.lua @@ -1,18 +1,19 @@ add_requires("cxxopts") target("NazaraShaderCompiler") - set_group("Tools") - set_kind("binary") + set_group("Tools") + set_kind("binary") set_basename("nzslc") + add_rpathdirs("$ORIGIN") - add_deps("NazaraShader") - add_packages("cxxopts", "fmt") + add_deps("NazaraShader") + add_packages("cxxopts", "fmt") - if has_config("unitybuild") then - add_rules("c++.unity_build") - end + if has_config("unitybuild") then + add_rules("c++.unity_build") + end - add_includedirs("../src") - add_headerfiles("../src/ShaderCompiler/**.hpp", "../src/ShaderCompiler/**.inl") - add_files("../src/ShaderCompiler/**.cpp") - set_policy("build.across_targets_in_parallel", false) + add_includedirs("../src") + add_headerfiles("../src/ShaderCompiler/**.hpp", "../src/ShaderCompiler/**.inl") + add_files("../src/ShaderCompiler/**.cpp") + set_policy("build.across_targets_in_parallel", false)