diff options
| author | jsmall-nvidia <jsmall@nvidia.com> | 2019-09-06 13:04:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-06 13:04:50 -0400 |
| commit | 4fc07614d6407e49a0c34e7483d410153c0b269a (patch) | |
| tree | 0e07fe23aa661a462d181d95e4a4a7a9c41fa992 /tools | |
| parent | ef36883ca1733a68162b199518275871c888391e (diff) | |
Use d3dcompiler_47.dll from slang-binaries on windows. (#1047)
* Use dxcompiler_47.dll from slang-binaries on windows.
* make https for git module slang-binaries
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/copy-hlsl-libs.bat | 4 | ||||
| -rw-r--r-- | tools/render-test/render-test-tool.vcxproj | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/tools/copy-hlsl-libs.bat b/tools/copy-hlsl-libs.bat index 91d5be852..2cd309aca 100644 --- a/tools/copy-hlsl-libs.bat +++ b/tools/copy-hlsl-libs.bat @@ -3,8 +3,10 @@ setlocal set SOURCE_DIR=%~1 set TARGET_DIR=%~2 +set PLATFORM=%~3 + +robocopy "../../external/slang-binaries/bin/%PLATFORM%" "%TARGET_DIR%" d3dcompiler_47.dll /r:0 >nul -robocopy "%SOURCE_DIR%" "%TARGET_DIR%" d3dcompiler_47.dll /r:0 >nul robocopy "%SOURCE_DIR%" "%TARGET_DIR%" dxcompiler.dll /r:0 >nul robocopy "%SOURCE_DIR%" "%TARGET_DIR%" dxil.dll /r:0 >nul diff --git a/tools/render-test/render-test-tool.vcxproj b/tools/render-test/render-test-tool.vcxproj index 8ab5d9859..0399d67e0 100644 --- a/tools/render-test/render-test-tool.vcxproj +++ b/tools/render-test/render-test-tool.vcxproj @@ -110,7 +110,7 @@ <ImportLibrary>..\..\bin\windows-x86\debug\render-test-tool.lib</ImportLibrary> </Link> <PostBuildEvent> - <Command>"$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/x86/" "../../bin/windows-x86/debug/"</Command> + <Command>"$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/x86/" "../../bin/windows-x86/debug/" "windows-x86"</Command> </PostBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -129,7 +129,7 @@ <ImportLibrary>..\..\bin\windows-x64\debug\render-test-tool.lib</ImportLibrary> </Link> <PostBuildEvent> - <Command>"$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/x64/" "../../bin/windows-x64/debug/"</Command> + <Command>"$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/x64/" "../../bin/windows-x64/debug/" "windows-x64"</Command> </PostBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -152,7 +152,7 @@ <ImportLibrary>..\..\bin\windows-x86\release\render-test-tool.lib</ImportLibrary> </Link> <PostBuildEvent> - <Command>"$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/x86/" "../../bin/windows-x86/release/"</Command> + <Command>"$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/x86/" "../../bin/windows-x86/release/" "windows-x86"</Command> </PostBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -175,7 +175,7 @@ <ImportLibrary>..\..\bin\windows-x64\release\render-test-tool.lib</ImportLibrary> </Link> <PostBuildEvent> - <Command>"$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/x64/" "../../bin/windows-x64/release/"</Command> + <Command>"$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/x64/" "../../bin/windows-x64/release/" "windows-x64"</Command> </PostBuildEvent> </ItemDefinitionGroup> <ItemGroup> |