Skip to content
This repository has been archived by the owner on Mar 30, 2019. It is now read-only.

Commit

Permalink
[SharpDX.Toolkit] Add SharpDX.Mathematics dependency to toolkit assem…
Browse files Browse the repository at this point in the history
…blies (#398)
  • Loading branch information
xoofx committed May 29, 2014
1 parent b266dd1 commit 570adaa
Show file tree
Hide file tree
Showing 6 changed files with 141 additions and 117 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@
<Compile Include="WaveBankReader.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\SharpDX.Mathematics\SharpDX.Mathematics.csproj">
<Project>{49e4485f-3a2a-4c35-a159-12eccfc00396}</Project>
<Name>SharpDX.Mathematics</Name>
</ProjectReference>
<ProjectReference Include="..\..\SharpDX.XAudio2\SharpDX.XAudio2.csproj">
<Project>{4995127e-0b8e-45b8-80c4-6bac1bbe3783}</Project>
<Name>SharpDX.XAudio2</Name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@
<Project>{3FC6DE77-B412-4101-9E64-6B9AA831179B}</Project>
<Name>SharpDX.DXGI</Name>
</ProjectReference>
<ProjectReference Include="..\..\SharpDX.Mathematics\SharpDX.Mathematics.csproj">
<Project>{49e4485f-3a2a-4c35-a159-12eccfc00396}</Project>
<Name>SharpDX.Mathematics</Name>
</ProjectReference>
<ProjectReference Include="..\..\SharpDX\SharpDX.csproj">
<Project>{d0bcd56a-41c4-4a4e-8590-26864ced07ff}</Project>
<Name>SharpDX</Name>
Expand Down
238 changes: 121 additions & 117 deletions Source/Toolkit/SharpDX.Toolkit.Game/SharpDX.Toolkit.Game.csproj
Original file line number Diff line number Diff line change
@@ -1,118 +1,122 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(SolutionDir)\Build\SharpDX.PreSettings.targets" />
<PropertyGroup>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{B2516A23-1A99-4263-964A-B820FD07FA80}</ProjectGuid>
<RootNamespace>SharpDX.Toolkit</RootNamespace>
<AssemblyName>SharpDX.Toolkit.Game</AssemblyName>
</PropertyGroup>
<ItemGroup Condition=" '$(SharpDXWin8)' == 'false'">
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="PresentationFramework" />
<Reference Include="PresentationCore" />
<Reference Include="WindowsBase" />
<Reference Include="System.Xaml" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\SharedAssemblyInfo.cs">
<Link>Properties\SharedAssemblyInfo.cs</Link>
</Compile>
<Compile Include="AssemblyDoc.cs" />
<Compile Include="Desktop\GameWindowDesktopWpf.cs" />
<Compile Include="Desktop\SharpDXElement.cs" />
<Compile Include="Desktop\ToolkitHwndHost.cs" />
<Compile Include="GameContext.WindowsPhoneBackgroundXaml.cs" />
<Compile Include="GameContext.WinRTBackgroundXaml.cs" />
<Compile Include="GameContext.WinRT.cs" />
<Compile Include="EffectCompilerSystem.Default.cs" />
<Compile Include="EffectCompilerEventArgs.cs" />
<Compile Include="EffectCompilerSystem.Desktop.cs" />
<Compile Include="EffectCompilerSystem.cs" />
<Compile Include="GameContext.cs" />
<Compile Include="GameContext.Desktop.cs" />
<Compile Include="GameContextType.cs" />
<Compile Include="GameWindowRenderer.cs" />
<Compile Include="IGamePlatform.cs" />
<Compile Include="IContentable.cs" />
<Compile Include="GameGraphicsParameters.cs" />
<Compile Include="WindowsPhone\GameWindowPhoneXaml.cs" />
<Compile Include="WinRT\GameWindowWinRTXaml.cs" />
<Compile Include="WinRT\GameWindowWinRT.cs" />
<Compile Include="WindowsPhone\GameWindowPhoneBackgroundXaml.cs" />
<Compile Include="WindowsPhone\GamePlatformPhone.cs" />
<Compile Include="WinRT\GamePlatformWinRT.cs" />
<Compile Include="Desktop\GameWindowDesktop.cs" />
<Compile Include="Desktop\GamePlatformDesktop.cs" />
<Compile Include="Game.cs" />
<Compile Include="GamePlatform.cs" />
<Compile Include="GameSystem.cs" />
<Compile Include="GameSystemCollection.cs" />
<Compile Include="GameServiceRegistry.cs" />
<Compile Include="GameTime.cs" />
<Compile Include="GameWindow.cs" />
<Compile Include="GraphicsDeviceInformation.cs" />
<Compile Include="GraphicsDeviceManager.cs" />
<Compile Include="IDrawable.cs" />
<Compile Include="IGameSystem.cs" />
<Compile Include="IGraphicsDeviceManager.cs" />
<Compile Include="IGraphicsDeviceFactory.cs" />
<Compile Include="IUpdateable.cs" />
<Compile Include="LaunchParameters.cs" />
<Compile Include="NamespaceDoc.cs" />
<Compile Include="PreparingDeviceSettingsEventArgs.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\SharpDX.Direct3D11\SharpDX.Direct3D11.csproj">
<Project>{736dfb52-1afe-4eff-9710-89046ab5b1f9}</Project>
<Name>SharpDX.Direct3D11</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\SharpDX.DXGI\SharpDX.DXGI.csproj">
<Project>{3fc6de77-b412-4101-9e64-6b9aa831179b}</Project>
<Name>SharpDX.DXGI</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\SharpDX\SharpDX.csproj">
<Project>{d0bcd56a-41c4-4a4e-8590-26864ced07ff}</Project>
<Name>SharpDX</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\SharpDX.Toolkit.Graphics\SharpDX.Toolkit.Graphics.csproj">
<Project>{53ef08a7-4224-434c-a62c-f29807c1c750}</Project>
<Name>SharpDX.Toolkit.Graphics</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\SharpDX.Toolkit\SharpDX.Toolkit.csproj">
<Project>{9ff0707c-75bb-4984-a01f-b9eaad293f6c}</Project>
<Name>SharpDX.Toolkit</Name>
<Private>False</Private>
</ProjectReference>
</ItemGroup>
<Choose>
<When Condition=" '$(Platform)' == 'Net40' or '$(Platform)' == 'DIRECTX11_2'">
<ItemGroup>
<ProjectReference Include="..\..\SharpDX.Direct3D9\SharpDX.Direct3D9.csproj">
<Project>{b4d984df-85b8-4bbf-8c3b-5cef905f40d9}</Project>
<Name>SharpDX.Direct3D9</Name>
</ProjectReference>
</ItemGroup>
</When>
</Choose>
<ItemGroup>
<None Include="SharpDX.Toolkit.Game.nuspec" />
</ItemGroup>
<Import Project="$(SolutionDir)\Build\SharpDX.PostSettings.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(SolutionDir)\Build\SharpDX.PreSettings.targets" />
<PropertyGroup>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{B2516A23-1A99-4263-964A-B820FD07FA80}</ProjectGuid>
<RootNamespace>SharpDX.Toolkit</RootNamespace>
<AssemblyName>SharpDX.Toolkit.Game</AssemblyName>
</PropertyGroup>
<ItemGroup Condition=" '$(SharpDXWin8)' == 'false'">
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="PresentationFramework" />
<Reference Include="PresentationCore" />
<Reference Include="WindowsBase" />
<Reference Include="System.Xaml" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\SharedAssemblyInfo.cs">
<Link>Properties\SharedAssemblyInfo.cs</Link>
</Compile>
<Compile Include="AssemblyDoc.cs" />
<Compile Include="Desktop\GameWindowDesktopWpf.cs" />
<Compile Include="Desktop\SharpDXElement.cs" />
<Compile Include="Desktop\ToolkitHwndHost.cs" />
<Compile Include="GameContext.WindowsPhoneBackgroundXaml.cs" />
<Compile Include="GameContext.WinRTBackgroundXaml.cs" />
<Compile Include="GameContext.WinRT.cs" />
<Compile Include="EffectCompilerSystem.Default.cs" />
<Compile Include="EffectCompilerEventArgs.cs" />
<Compile Include="EffectCompilerSystem.Desktop.cs" />
<Compile Include="EffectCompilerSystem.cs" />
<Compile Include="GameContext.cs" />
<Compile Include="GameContext.Desktop.cs" />
<Compile Include="GameContextType.cs" />
<Compile Include="GameWindowRenderer.cs" />
<Compile Include="IGamePlatform.cs" />
<Compile Include="IContentable.cs" />
<Compile Include="GameGraphicsParameters.cs" />
<Compile Include="WindowsPhone\GameWindowPhoneXaml.cs" />
<Compile Include="WinRT\GameWindowWinRTXaml.cs" />
<Compile Include="WinRT\GameWindowWinRT.cs" />
<Compile Include="WindowsPhone\GameWindowPhoneBackgroundXaml.cs" />
<Compile Include="WindowsPhone\GamePlatformPhone.cs" />
<Compile Include="WinRT\GamePlatformWinRT.cs" />
<Compile Include="Desktop\GameWindowDesktop.cs" />
<Compile Include="Desktop\GamePlatformDesktop.cs" />
<Compile Include="Game.cs" />
<Compile Include="GamePlatform.cs" />
<Compile Include="GameSystem.cs" />
<Compile Include="GameSystemCollection.cs" />
<Compile Include="GameServiceRegistry.cs" />
<Compile Include="GameTime.cs" />
<Compile Include="GameWindow.cs" />
<Compile Include="GraphicsDeviceInformation.cs" />
<Compile Include="GraphicsDeviceManager.cs" />
<Compile Include="IDrawable.cs" />
<Compile Include="IGameSystem.cs" />
<Compile Include="IGraphicsDeviceManager.cs" />
<Compile Include="IGraphicsDeviceFactory.cs" />
<Compile Include="IUpdateable.cs" />
<Compile Include="LaunchParameters.cs" />
<Compile Include="NamespaceDoc.cs" />
<Compile Include="PreparingDeviceSettingsEventArgs.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\SharpDX.Direct3D11\SharpDX.Direct3D11.csproj">
<Project>{736dfb52-1afe-4eff-9710-89046ab5b1f9}</Project>
<Name>SharpDX.Direct3D11</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\SharpDX.DXGI\SharpDX.DXGI.csproj">
<Project>{3fc6de77-b412-4101-9e64-6b9aa831179b}</Project>
<Name>SharpDX.DXGI</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\SharpDX.Mathematics\SharpDX.Mathematics.csproj">
<Project>{49e4485f-3a2a-4c35-a159-12eccfc00396}</Project>
<Name>SharpDX.Mathematics</Name>
</ProjectReference>
<ProjectReference Include="..\..\SharpDX\SharpDX.csproj">
<Project>{d0bcd56a-41c4-4a4e-8590-26864ced07ff}</Project>
<Name>SharpDX</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\SharpDX.Toolkit.Graphics\SharpDX.Toolkit.Graphics.csproj">
<Project>{53ef08a7-4224-434c-a62c-f29807c1c750}</Project>
<Name>SharpDX.Toolkit.Graphics</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\SharpDX.Toolkit\SharpDX.Toolkit.csproj">
<Project>{9ff0707c-75bb-4984-a01f-b9eaad293f6c}</Project>
<Name>SharpDX.Toolkit</Name>
<Private>False</Private>
</ProjectReference>
</ItemGroup>
<Choose>
<When Condition=" '$(Platform)' == 'Net40' or '$(Platform)' == 'DIRECTX11_2'">
<ItemGroup>
<ProjectReference Include="..\..\SharpDX.Direct3D9\SharpDX.Direct3D9.csproj">
<Project>{b4d984df-85b8-4bbf-8c3b-5cef905f40d9}</Project>
<Name>SharpDX.Direct3D9</Name>
</ProjectReference>
</ItemGroup>
</When>
</Choose>
<ItemGroup>
<None Include="SharpDX.Toolkit.Game.nuspec" />
</ItemGroup>
<Import Project="$(SolutionDir)\Build\SharpDX.PostSettings.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,10 @@
<Name>SharpDX.DXGI</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\SharpDX.Mathematics\SharpDX.Mathematics.csproj">
<Project>{49e4485f-3a2a-4c35-a159-12eccfc00396}</Project>
<Name>SharpDX.Mathematics</Name>
</ProjectReference>
<ProjectReference Include="..\..\SharpDX\SharpDX.csproj">
<Project>{d0bcd56a-41c4-4a4e-8590-26864ced07ff}</Project>
<Name>SharpDX</Name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,10 @@
<Name>SharpDX.DXGI</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\SharpDX.Mathematics\SharpDX.Mathematics.csproj">
<Project>{49e4485f-3a2a-4c35-a159-12eccfc00396}</Project>
<Name>SharpDX.Mathematics</Name>
</ProjectReference>
<ProjectReference Include="..\..\SharpDX\SharpDX.csproj">
<Project>{d0bcd56a-41c4-4a4e-8590-26864ced07ff}</Project>
<Name>SharpDX</Name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@
<Compile Include="YamlManager.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\SharpDX.Mathematics\SharpDX.Mathematics.csproj">
<Project>{49e4485f-3a2a-4c35-a159-12eccfc00396}</Project>
<Name>SharpDX.Mathematics</Name>
</ProjectReference>
<ProjectReference Include="..\..\SharpDX\SharpDX.csproj">
<Project>{d0bcd56a-41c4-4a4e-8590-26864ced07ff}</Project>
<Name>SharpDX</Name>
Expand Down

0 comments on commit 570adaa

Please sign in to comment.