summaryrefslogtreecommitdiffstats
path: root/premake5.lua
diff options
context:
space:
mode:
authorjsmall-nvidia <jsmall@nvidia.com>2018-12-17 09:22:14 -0500
committerGitHub <noreply@github.com>2018-12-17 09:22:14 -0500
commitd2ddc590601778f309c81f7d19d5e7fed34210de (patch)
tree8ad5dd912fe43e946a4e40cce3eb6c8410254600 /premake5.lua
parentd43c566fa29bbc0da1534aea236d54ee5ca104b8 (diff)
Feature/test tool shared libraries (#758)
* Remove circular reference to renderer on Vk & D3D12 DescriptorSetImpl * Refactor Stbi image loading such that memory is correctly freed when goes out of scope. Added Crt memory dump at termination. Reduced erroneous reporting by scoping TestContext. * Used capitalized acronym for STBImage to keep Tim happy. * Split out TestReporter - to just handle reporting test results Split out Options Made TestContext hold options, and the reporter Removed remaining memory leaks. * Small optimization for rawWrite, such that it directly writes over print.. * Improve comments on TestCategorySet * Fix typos in TestCategorySet * Made slangc a cpp file as part of slang-test (removing need for separate project/shared library). * * Made all test tools only available as dlls. * Made possible to invoke test tool dll from command line slang-test slangc [--bindir xxx] options to slangc * Fix Visual Studio projects that are no longer needed.
Diffstat (limited to 'premake5.lua')
-rw-r--r--premake5.lua39
1 files changed, 3 insertions, 36 deletions
diff --git a/premake5.lua b/premake5.lua
index 16b599e1a..7bb84291e 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -338,27 +338,16 @@ function standardProject(name)
end
function toolSharedLibrary(name)
- group "tool-shared-library"
+ group "test-tool"
-- specifying that the project lives under the `tools/` path.
--
- baseSlangProject(name .. "-shared-library", "tools/" .. name)
+ baseSlangProject(name .. "-tool", "tools/" .. name)
defines { "SLANG_SHARED_LIBRARY_TOOL" }
kind "SharedLib"
end
-function standardSharedLibraryProject(name)
- group "tool-shared-library"
- -- A standard project has its code under `source/`
- --
- baseSlangProject(name .. "-shared-library", "source/".. name)
-
- defines { "SLANG_SHARED_LIBRARY_TOOL" }
-
- kind "SharedLib"
-end
-
-- Finally we have the example programs that show how to use Slang.
--
function example(name)
@@ -460,11 +449,6 @@ tool "slang-test"
-- to do its job:
--
-tool "slang-reflection-test"
- uuid "22C45F4F-FB6B-4535-BED1-D3F5D0C71047"
- includedirs { "." }
- links { "slang", "core" }
-
toolSharedLibrary "slang-reflection-test"
uuid "C5ACCA6E-C04D-4B36-8516-3752B3C13C2F"
@@ -487,19 +471,7 @@ toolSharedLibrary "slang-reflection-test"
-- TODO: Fix that requirement.
--
-if os.target() == "windows" then
- tool "render-test"
- uuid "96610759-07B9-4EEB-A974-5C634A2E742B"
- includedirs { ".", "external", "source", "tools/gfx" }
- links { "core", "slang", "gfx" }
-
- systemversion "10.0.14393.0"
-
- -- For Windows targets, we want to copy d3dcompiler_47.dll,
- -- dxcompiler.dll, and dxil.dll from the Windows SDK redistributable
- -- directory into the output directory.
- postbuildcommands { '"$(SolutionDir)tools\\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/%{cfg.platform:lower()}/" "%{cfg.targetdir}/"'}
-
+if os.target() == "windows" then
toolSharedLibrary "render-test"
uuid "61F7EB00-7281-4BF3-9470-7C2EA92620C3"
@@ -553,11 +525,6 @@ standardProject "slangc"
uuid "D56CBCEB-1EB5-4CA8-AEC4-48EA35ED61C7"
kind "ConsoleApp"
links { "core", "slang" }
-
-standardSharedLibraryProject "slangc"
- uuid "644921BF-D228-4EEF-8CDA-11716DB06989"
- kind "SharedLib"
- links { "core", "slang" }
--
-- TODO: Slang's current `Makefile` build does some careful incantations