Commit 992056ad by Jamie Madill

Add a rule to copy the D3D compiler DLL to the output folder.

BUG=315387 Change-Id: I293798ecb7ec167691a1f490c050a48970b17be3 Reviewed-on: https://chromium-review.googlesource.com/177695Reviewed-by: 's avatarShannon Woods <shannonwoods@chromium.org> Commit-Queue: Shannon Woods <shannonwoods@chromium.org> Tested-by: 's avatarShannon Woods <shannonwoods@chromium.org>
parent 00f6bc32
...@@ -349,6 +349,14 @@ ...@@ -349,6 +349,14 @@
<ResourceCompile Include="..\..\src\libGLESv2\libGLESv2.rc"/> <ResourceCompile Include="..\..\src\libGLESv2\libGLESv2.rc"/>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<CustomBuild Include="..\..\src\copy_compiler_dll.bat">
<FileType>Document</FileType>
<Command>call call copy_compiler_dll.bat &quot;$(Platform)&quot; &quot;C:\Program Files (x86)\Windows Kits\8.0&quot; &quot;$(OutDir)&quot;</Command>
<Message>Copying D3D Compiler DLL...</Message>
<Outputs>$(OutDir)\D3DCompiler_46.dll</Outputs>
</CustomBuild>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="translator_static.vcxproj"> <ProjectReference Include="translator_static.vcxproj">
<Project>{19386E01-D811-FA3B-9F1E-122BB0C0E9F5}</Project> <Project>{19386E01-D811-FA3B-9F1E-122BB0C0E9F5}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly> <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
......
...@@ -10,6 +10,9 @@ ...@@ -10,6 +10,9 @@
<Filter Include="..\..\src"> <Filter Include="..\..\src">
<UniqueIdentifier>{8CDEE807-BC53-E450-C8B8-4DEBB66742D4}</UniqueIdentifier> <UniqueIdentifier>{8CDEE807-BC53-E450-C8B8-4DEBB66742D4}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="..\..\src\_excluded_files">
<UniqueIdentifier>{158E591E-B6EA-0C85-8F5A-18EAFA09B4CE}</UniqueIdentifier>
</Filter>
<Filter Include="..\..\src\libGLESv2"> <Filter Include="..\..\src\libGLESv2">
<UniqueIdentifier>{A62A9415-2E9D-A6D2-631D-1F25A5CD626F}</UniqueIdentifier> <UniqueIdentifier>{A62A9415-2E9D-A6D2-631D-1F25A5CD626F}</UniqueIdentifier>
</Filter> </Filter>
...@@ -48,6 +51,9 @@ ...@@ -48,6 +51,9 @@
<None Include="..\..\src\angle.gyp"> <None Include="..\..\src\angle.gyp">
<Filter>..\..\src</Filter> <Filter>..\..\src</Filter>
</None> </None>
<None Include="..\..\src\copy_compiler_dll.bat">
<Filter>..\..\src\_excluded_files</Filter>
</None>
<ClInclude Include="..\..\src\libGLESv2\resource.h"> <ClInclude Include="..\..\src\libGLESv2\resource.h">
<Filter>..\..\src\libGLESv2</Filter> <Filter>..\..\src\libGLESv2</Filter>
</ClInclude> </ClInclude>
......
@echo off
set _arch=%1
set _arch=%_arch:Win32=x86%
set _arch=%_arch:"=%
set _sdkdir=%2
set _sdkdir=%_sdkdir:"=%
copy "%_sdkdir%\Redist\D3D\%_arch%\d3dcompiler_46.dll" %3
...@@ -47,6 +47,17 @@ ...@@ -47,6 +47,17 @@
] ]
} }
}, },
'actions':
[
{
'msvs_cygwin_shell': 0,
'action_name': 'copy_dll',
'message': 'Copying D3D Compiler DLL...',
'inputs': [ 'copy_compiler_dll.bat' ],
'outputs': [ '<(PRODUCT_DIR)/D3DCompiler_46.dll' ],
'action': ["copy_compiler_dll.bat", "$(PlatformName)", "<(windows_sdk_path)", "<(PRODUCT_DIR)" ],
}
] #actions
}, },
], ],
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment