Skip to content

Commit

Permalink
Upgrade to SharpDX 4.0.1 (MonoGame#5949)
Browse files Browse the repository at this point in the history
* Upgrade SharpDX dependencies

* Upgrade references
  • Loading branch information
Jjagg authored and nkast committed Jun 26, 2018
1 parent cd23dbd commit c73977b
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions Build/Projects/2MGFXReferences.definition
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<Platform Type="Windows">
<Binary
Name="SharpDX"
Path="ThirdParty/Dependencies/SharpDX/Desktop/SharpDX.dll" />
Path="ThirdParty/Dependencies/SharpDX/SharpDX.dll" />
<Binary
Name="SharpDX.D3DCompiler"
Path="ThirdParty/Dependencies/SharpDX/Desktop/SharpDX.D3DCompiler.dll" />
Path="ThirdParty/Dependencies/SharpDX/SharpDX.D3DCompiler.dll" />
<Binary
Name="CppNet"
Path="ThirdParty/Dependencies/CppNet/CppNet.dll" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,10 @@
<Platform Type="Windows">
<Binary
Name="SharpDX"
Path="ThirdParty/Dependencies/SharpDX/Desktop/SharpDX.dll" />
Path="ThirdParty/Dependencies/SharpDX/SharpDX.dll" />
<Binary
Name="SharpDX.D3DCompiler"
Path="ThirdParty\Dependencies\SharpDX\Desktop\SharpDX.D3DCompiler.dll" />
Path="ThirdParty\Dependencies\SharpDX\SharpDX.D3DCompiler.dll" />
<Binary
Name="CppNet"
Path="ThirdParty\Dependencies\CppNet\CppNet.dll" />
Expand Down
26 changes: 13 additions & 13 deletions Build/Projects/FrameworkReferences.definition
Original file line number Diff line number Diff line change
Expand Up @@ -46,25 +46,25 @@
<Reference Include="System.Xml" />
<Binary
Name="SharpDX"
Path="ThirdParty/Dependencies/SharpDX/Desktop/SharpDX.dll" />
Path="ThirdParty/Dependencies/SharpDX/SharpDX.dll" />
<Binary
Name="SharpDX.Direct2D1"
Path="ThirdParty/Dependencies/SharpDX/Desktop/SharpDX.Direct2D1.dll" />
Path="ThirdParty/Dependencies/SharpDX/SharpDX.Direct2D1.dll" />
<Binary
Name="SharpDX.Direct3D11"
Path="ThirdParty/Dependencies/SharpDX/Desktop/SharpDX.Direct3D11.dll" />
Path="ThirdParty/Dependencies/SharpDX/SharpDX.Direct3D11.dll" />
<Binary
Name="SharpDX.DXGI"
Path="ThirdParty/Dependencies/SharpDX/Desktop/SharpDX.DXGI.dll" />
Path="ThirdParty/Dependencies/SharpDX/SharpDX.DXGI.dll" />
<Binary
Name="SharpDX.MediaFoundation"
Path="ThirdParty/Dependencies/SharpDX/Desktop/SharpDX.MediaFoundation.dll" />
Path="ThirdParty/Dependencies/SharpDX/net45/SharpDX.MediaFoundation.dll" />
<Binary
Name="SharpDX.XAudio2"
Path="ThirdParty/Dependencies/SharpDX/Desktop/SharpDX.XAudio2.dll" />
Path="ThirdParty/Dependencies/SharpDX/SharpDX.XAudio2.dll" />
<Binary
Name="SharpDX.XInput"
Path="ThirdParty/Dependencies/SharpDX/Desktop/SharpDX.XInput.dll" />
Path="ThirdParty/Dependencies/SharpDX/SharpDX.XInput.dll" />
</Service>

<Service Name="MonoGame.Framework/OpenGLGraphics">
Expand Down Expand Up @@ -92,22 +92,22 @@
<Platform Type="WindowsUniversal">
<Binary
Name="SharpDX"
Path="ThirdParty/Dependencies/SharpDX/StoreApp/SharpDX.dll" />
Path="ThirdParty/Dependencies/SharpDX/SharpDX.dll" />
<Binary
Name="SharpDX.Direct2D1"
Path="ThirdParty/Dependencies/SharpDX/StoreApp/SharpDX.Direct2D1.dll" />
Path="ThirdParty/Dependencies/SharpDX/SharpDX.Direct2D1.dll" />
<Binary
Name="SharpDX.Direct3D11"
Path="ThirdParty/Dependencies/SharpDX/StoreApp/SharpDX.Direct3D11.dll" />
Path="ThirdParty/Dependencies/SharpDX/SharpDX.Direct3D11.dll" />
<Binary
Name="SharpDX.DXGI"
Path="ThirdParty/Dependencies/SharpDX/StoreApp/SharpDX.DXGI.dll" />
Path="ThirdParty/Dependencies/SharpDX/SharpDX.DXGI.dll" />
<Binary
Name="SharpDX.MediaFoundation"
Path="ThirdParty/Dependencies/SharpDX/StoreApp/SharpDX.MediaFoundation.dll" />
Path="ThirdParty/Dependencies/SharpDX/SharpDX.MediaFoundation.dll" />
<Binary
Name="SharpDX.XAudio2"
Path="ThirdParty/Dependencies/SharpDX/StoreApp/SharpDX.XAudio2.dll" />
Path="ThirdParty/Dependencies/SharpDX/SharpDX.XAudio2.dll" />
</Platform>

<Platform Type="Web">
Expand Down
2 changes: 1 addition & 1 deletion ThirdParty/Dependencies

0 comments on commit c73977b

Please sign in to comment.