diff --git a/RenderSystems/ANX.RenderSystem.Windows.DX10/Buffer.cs b/RenderSystems/ANX.RenderSystem.Windows.DX10/Buffer.cs index 8d94e087..8cf0acfd 100644 --- a/RenderSystems/ANX.RenderSystem.Windows.DX10/Buffer.cs +++ b/RenderSystems/ANX.RenderSystem.Windows.DX10/Buffer.cs @@ -45,7 +45,8 @@ namespace ANX.RenderSystem.Windows.DX10 protected DataStream MapBuffer(Dx.Buffer buffer, ResourceMapping mapping) { - CheckUsage(mapping); + if ((mapping & ResourceMapping.Read) != 0 && usage == BufferUsage.WriteOnly) + throw new NotSupportedException("Resource was created with WriteOnly, reading from it is not supported."); if (isDynamic && mapping == ResourceMapping.Write) return buffer.Map(Dx.MapMode.WriteDiscard); @@ -70,16 +71,8 @@ namespace ANX.RenderSystem.Windows.DX10 get { return !isDynamic; } } - private void CheckUsage(ResourceMapping mapping) - { - if ((mapping & ResourceMapping.Write) != 0 && usage == BufferUsage.None) - throw new NotSupportedException("Resource was created with WriteOnly, reading from it is not supported."); - } - protected Dx.Buffer CreateStagingBuffer(ResourceMapping mapping) { - CheckUsage(mapping); - var description = new Dx.BufferDescription() { Usage = Dx.ResourceUsage.Staging, diff --git a/RenderSystems/ANX.RenderSystem.Windows.DX11/Buffer.cs b/RenderSystems/ANX.RenderSystem.Windows.DX11/Buffer.cs index 86e6ede2..812f4cd8 100644 --- a/RenderSystems/ANX.RenderSystem.Windows.DX11/Buffer.cs +++ b/RenderSystems/ANX.RenderSystem.Windows.DX11/Buffer.cs @@ -45,7 +45,8 @@ namespace ANX.RenderSystem.Windows.DX11 protected DataStream MapBuffer(Dx.Buffer buffer, ResourceMapping mapping) { - CheckUsage(mapping); + if ((mapping & ResourceMapping.Read) != 0 && usage == BufferUsage.WriteOnly) + throw new NotSupportedException("Resource was created with WriteOnly, reading from it is not supported."); Dx.MapMode mapMode; if (isDynamic && mapping == ResourceMapping.Write) @@ -75,16 +76,8 @@ namespace ANX.RenderSystem.Windows.DX11 get { return !this.isDynamic; } } - private void CheckUsage(ResourceMapping mapping) - { - if ((mapping & ResourceMapping.Write) != 0 && usage == BufferUsage.None) - throw new NotSupportedException("Resource was created with WriteOnly, reading from it is not supported."); - } - protected Dx.Buffer CreateStagingBuffer(ResourceMapping mapping) { - CheckUsage(mapping); - var description = new Dx.BufferDescription() { Usage = Dx.ResourceUsage.Staging, diff --git a/Samples/TextRendering.sln b/Samples/TextRendering.sln index f1de603e..b3b4b45d 100644 --- a/Samples/TextRendering.sln +++ b/Samples/TextRendering.sln @@ -1,58 +1,211 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleContent", "SampleContent\SampleContent.contentproj", "{FA6E229D-4504-47B1-8A23-2D3FCC13F778}" -EndProject +# Visual Studio 2013 +VisualStudioVersion = 12.0.40629.0 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextRendering", "TextRendering\TextRendering.csproj", "{BC79B021-10E4-4D01-945A-7048FFF53A22}" + ProjectSection(ProjectDependencies) = postProject + {75EFAE60-726E-430F-8661-4CF9ABD1306C} = {75EFAE60-726E-430F-8661-4CF9ABD1306C} + EndProjectSection +EndProject +Project("{75EFAE60-726E-430F-8661-4CF9ABD1306C}") = "SampleContent", "SampleContent\SampleContent.cproj", "{75EFAE60-726E-430F-8661-4CF9ABD1306C}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Android = Debug|Android Debug|Any CPU = Debug|Any CPU + Debug|iOS = Debug|iOS + Debug|Linux = Debug|Linux + Debug|Mac OS = Debug|Mac OS Debug|Mixed Platforms = Debug|Mixed Platforms + Debug|PS Vita = Debug|PS Vita + Debug|Windows = Debug|Windows + Debug|Windows Metro = Debug|Windows Metro + Debug|Windows Phone = Debug|Windows Phone Debug|x86 = Debug|x86 + Debug|XBox 360 = Debug|XBox 360 + DebugWin8|Android = DebugWin8|Android DebugWin8|Any CPU = DebugWin8|Any CPU + DebugWin8|iOS = DebugWin8|iOS + DebugWin8|Linux = DebugWin8|Linux + DebugWin8|Mac OS = DebugWin8|Mac OS DebugWin8|Mixed Platforms = DebugWin8|Mixed Platforms + DebugWin8|PS Vita = DebugWin8|PS Vita + DebugWin8|Windows = DebugWin8|Windows + DebugWin8|Windows Metro = DebugWin8|Windows Metro + DebugWin8|Windows Phone = DebugWin8|Windows Phone DebugWin8|x86 = DebugWin8|x86 + DebugWin8|XBox 360 = DebugWin8|XBox 360 + Release|Android = Release|Android Release|Any CPU = Release|Any CPU + Release|iOS = Release|iOS + Release|Linux = Release|Linux + Release|Mac OS = Release|Mac OS Release|Mixed Platforms = Release|Mixed Platforms + Release|PS Vita = Release|PS Vita + Release|Windows = Release|Windows + Release|Windows Metro = Release|Windows Metro + Release|Windows Phone = Release|Windows Phone Release|x86 = Release|x86 + Release|XBox 360 = Release|XBox 360 + ReleaseWin8|Android = ReleaseWin8|Android ReleaseWin8|Any CPU = ReleaseWin8|Any CPU + ReleaseWin8|iOS = ReleaseWin8|iOS + ReleaseWin8|Linux = ReleaseWin8|Linux + ReleaseWin8|Mac OS = ReleaseWin8|Mac OS ReleaseWin8|Mixed Platforms = ReleaseWin8|Mixed Platforms + ReleaseWin8|PS Vita = ReleaseWin8|PS Vita + ReleaseWin8|Windows = ReleaseWin8|Windows + ReleaseWin8|Windows Metro = ReleaseWin8|Windows Metro + ReleaseWin8|Windows Phone = ReleaseWin8|Windows Phone ReleaseWin8|x86 = ReleaseWin8|x86 + ReleaseWin8|XBox 360 = ReleaseWin8|XBox 360 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {FA6E229D-4504-47B1-8A23-2D3FCC13F778}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA6E229D-4504-47B1-8A23-2D3FCC13F778}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {FA6E229D-4504-47B1-8A23-2D3FCC13F778}.Debug|x86.ActiveCfg = Debug|Any CPU - {FA6E229D-4504-47B1-8A23-2D3FCC13F778}.DebugWin8|Any CPU.ActiveCfg = Debug|Any CPU - {FA6E229D-4504-47B1-8A23-2D3FCC13F778}.DebugWin8|Mixed Platforms.ActiveCfg = Debug|Any CPU - {FA6E229D-4504-47B1-8A23-2D3FCC13F778}.DebugWin8|x86.ActiveCfg = Debug|Any CPU - {FA6E229D-4504-47B1-8A23-2D3FCC13F778}.Release|Any CPU.ActiveCfg = Debug|Any CPU - {FA6E229D-4504-47B1-8A23-2D3FCC13F778}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU - {FA6E229D-4504-47B1-8A23-2D3FCC13F778}.Release|x86.ActiveCfg = Debug|Any CPU - {FA6E229D-4504-47B1-8A23-2D3FCC13F778}.ReleaseWin8|Any CPU.ActiveCfg = Debug|Any CPU - {FA6E229D-4504-47B1-8A23-2D3FCC13F778}.ReleaseWin8|Mixed Platforms.ActiveCfg = Debug|Any CPU - {FA6E229D-4504-47B1-8A23-2D3FCC13F778}.ReleaseWin8|x86.ActiveCfg = Debug|Any CPU + {BC79B021-10E4-4D01-945A-7048FFF53A22}.Debug|Android.ActiveCfg = Debug|x86 {BC79B021-10E4-4D01-945A-7048FFF53A22}.Debug|Any CPU.ActiveCfg = Debug|x86 + {BC79B021-10E4-4D01-945A-7048FFF53A22}.Debug|iOS.ActiveCfg = Debug|x86 + {BC79B021-10E4-4D01-945A-7048FFF53A22}.Debug|Linux.ActiveCfg = Debug|x86 + {BC79B021-10E4-4D01-945A-7048FFF53A22}.Debug|Mac OS.ActiveCfg = Debug|x86 {BC79B021-10E4-4D01-945A-7048FFF53A22}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 {BC79B021-10E4-4D01-945A-7048FFF53A22}.Debug|Mixed Platforms.Build.0 = Debug|x86 + {BC79B021-10E4-4D01-945A-7048FFF53A22}.Debug|PS Vita.ActiveCfg = Debug|x86 + {BC79B021-10E4-4D01-945A-7048FFF53A22}.Debug|Windows.ActiveCfg = Debug|x86 + {BC79B021-10E4-4D01-945A-7048FFF53A22}.Debug|Windows Metro.ActiveCfg = Debug|x86 + {BC79B021-10E4-4D01-945A-7048FFF53A22}.Debug|Windows Phone.ActiveCfg = Debug|x86 {BC79B021-10E4-4D01-945A-7048FFF53A22}.Debug|x86.ActiveCfg = Debug|x86 {BC79B021-10E4-4D01-945A-7048FFF53A22}.Debug|x86.Build.0 = Debug|x86 + {BC79B021-10E4-4D01-945A-7048FFF53A22}.Debug|XBox 360.ActiveCfg = Debug|x86 + {BC79B021-10E4-4D01-945A-7048FFF53A22}.DebugWin8|Android.ActiveCfg = DebugWin8|x86 {BC79B021-10E4-4D01-945A-7048FFF53A22}.DebugWin8|Any CPU.ActiveCfg = DebugWin8|x86 + {BC79B021-10E4-4D01-945A-7048FFF53A22}.DebugWin8|iOS.ActiveCfg = DebugWin8|x86 + {BC79B021-10E4-4D01-945A-7048FFF53A22}.DebugWin8|Linux.ActiveCfg = DebugWin8|x86 + {BC79B021-10E4-4D01-945A-7048FFF53A22}.DebugWin8|Mac OS.ActiveCfg = DebugWin8|x86 {BC79B021-10E4-4D01-945A-7048FFF53A22}.DebugWin8|Mixed Platforms.ActiveCfg = DebugWin8|x86 {BC79B021-10E4-4D01-945A-7048FFF53A22}.DebugWin8|Mixed Platforms.Build.0 = DebugWin8|x86 + {BC79B021-10E4-4D01-945A-7048FFF53A22}.DebugWin8|PS Vita.ActiveCfg = DebugWin8|x86 + {BC79B021-10E4-4D01-945A-7048FFF53A22}.DebugWin8|Windows.ActiveCfg = DebugWin8|x86 + {BC79B021-10E4-4D01-945A-7048FFF53A22}.DebugWin8|Windows Metro.ActiveCfg = DebugWin8|x86 + {BC79B021-10E4-4D01-945A-7048FFF53A22}.DebugWin8|Windows Phone.ActiveCfg = DebugWin8|x86 {BC79B021-10E4-4D01-945A-7048FFF53A22}.DebugWin8|x86.ActiveCfg = DebugWin8|x86 {BC79B021-10E4-4D01-945A-7048FFF53A22}.DebugWin8|x86.Build.0 = DebugWin8|x86 + {BC79B021-10E4-4D01-945A-7048FFF53A22}.DebugWin8|XBox 360.ActiveCfg = DebugWin8|x86 + {BC79B021-10E4-4D01-945A-7048FFF53A22}.Release|Android.ActiveCfg = Release|x86 {BC79B021-10E4-4D01-945A-7048FFF53A22}.Release|Any CPU.ActiveCfg = Release|x86 + {BC79B021-10E4-4D01-945A-7048FFF53A22}.Release|iOS.ActiveCfg = Release|x86 + {BC79B021-10E4-4D01-945A-7048FFF53A22}.Release|Linux.ActiveCfg = Release|x86 + {BC79B021-10E4-4D01-945A-7048FFF53A22}.Release|Mac OS.ActiveCfg = Release|x86 {BC79B021-10E4-4D01-945A-7048FFF53A22}.Release|Mixed Platforms.ActiveCfg = Release|x86 {BC79B021-10E4-4D01-945A-7048FFF53A22}.Release|Mixed Platforms.Build.0 = Release|x86 + {BC79B021-10E4-4D01-945A-7048FFF53A22}.Release|PS Vita.ActiveCfg = Release|x86 + {BC79B021-10E4-4D01-945A-7048FFF53A22}.Release|Windows.ActiveCfg = Release|x86 + {BC79B021-10E4-4D01-945A-7048FFF53A22}.Release|Windows Metro.ActiveCfg = Release|x86 + {BC79B021-10E4-4D01-945A-7048FFF53A22}.Release|Windows Phone.ActiveCfg = Release|x86 {BC79B021-10E4-4D01-945A-7048FFF53A22}.Release|x86.ActiveCfg = Release|x86 {BC79B021-10E4-4D01-945A-7048FFF53A22}.Release|x86.Build.0 = Release|x86 + {BC79B021-10E4-4D01-945A-7048FFF53A22}.Release|XBox 360.ActiveCfg = Release|x86 + {BC79B021-10E4-4D01-945A-7048FFF53A22}.ReleaseWin8|Android.ActiveCfg = ReleaseWin8|x86 {BC79B021-10E4-4D01-945A-7048FFF53A22}.ReleaseWin8|Any CPU.ActiveCfg = ReleaseWin8|x86 + {BC79B021-10E4-4D01-945A-7048FFF53A22}.ReleaseWin8|iOS.ActiveCfg = ReleaseWin8|x86 + {BC79B021-10E4-4D01-945A-7048FFF53A22}.ReleaseWin8|Linux.ActiveCfg = ReleaseWin8|x86 + {BC79B021-10E4-4D01-945A-7048FFF53A22}.ReleaseWin8|Mac OS.ActiveCfg = ReleaseWin8|x86 {BC79B021-10E4-4D01-945A-7048FFF53A22}.ReleaseWin8|Mixed Platforms.ActiveCfg = ReleaseWin8|x86 {BC79B021-10E4-4D01-945A-7048FFF53A22}.ReleaseWin8|Mixed Platforms.Build.0 = ReleaseWin8|x86 + {BC79B021-10E4-4D01-945A-7048FFF53A22}.ReleaseWin8|PS Vita.ActiveCfg = ReleaseWin8|x86 + {BC79B021-10E4-4D01-945A-7048FFF53A22}.ReleaseWin8|Windows.ActiveCfg = ReleaseWin8|x86 + {BC79B021-10E4-4D01-945A-7048FFF53A22}.ReleaseWin8|Windows Metro.ActiveCfg = ReleaseWin8|x86 + {BC79B021-10E4-4D01-945A-7048FFF53A22}.ReleaseWin8|Windows Phone.ActiveCfg = ReleaseWin8|x86 {BC79B021-10E4-4D01-945A-7048FFF53A22}.ReleaseWin8|x86.ActiveCfg = ReleaseWin8|x86 {BC79B021-10E4-4D01-945A-7048FFF53A22}.ReleaseWin8|x86.Build.0 = ReleaseWin8|x86 + {BC79B021-10E4-4D01-945A-7048FFF53A22}.ReleaseWin8|XBox 360.ActiveCfg = ReleaseWin8|x86 + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|Android.ActiveCfg = Debug|Android + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|Android.Build.0 = Debug|Android + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|Any CPU.ActiveCfg = Debug|Android + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|iOS.ActiveCfg = Debug|iOS + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|iOS.Build.0 = Debug|iOS + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|Linux.ActiveCfg = Debug|Linux + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|Linux.Build.0 = Debug|Linux + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|Mac OS.ActiveCfg = Debug|Mac OS + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|Mac OS.Build.0 = Debug|Mac OS + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|Mixed Platforms.ActiveCfg = Debug|XBox 360 + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|Mixed Platforms.Build.0 = Debug|XBox 360 + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|PS Vita.ActiveCfg = Debug|PS Vita + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|PS Vita.Build.0 = Debug|PS Vita + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|Windows.ActiveCfg = Debug|Windows + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|Windows.Build.0 = Debug|Windows + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|Windows Metro.ActiveCfg = Debug|Windows Metro + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|Windows Metro.Build.0 = Debug|Windows Metro + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|Windows Phone.ActiveCfg = Debug|Windows Phone + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|Windows Phone.Build.0 = Debug|Windows Phone + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|x86.ActiveCfg = Debug|XBox 360 + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|XBox 360.ActiveCfg = Debug|XBox 360 + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|XBox 360.Build.0 = Debug|XBox 360 + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.DebugWin8|Android.ActiveCfg = Debug|Android + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.DebugWin8|Android.Build.0 = Debug|Android + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.DebugWin8|Any CPU.ActiveCfg = Debug|Android + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.DebugWin8|iOS.ActiveCfg = Debug|iOS + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.DebugWin8|iOS.Build.0 = Debug|iOS + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.DebugWin8|Linux.ActiveCfg = Debug|Linux + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.DebugWin8|Linux.Build.0 = Debug|Linux + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.DebugWin8|Mac OS.ActiveCfg = Debug|Mac OS + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.DebugWin8|Mac OS.Build.0 = Debug|Mac OS + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.DebugWin8|Mixed Platforms.ActiveCfg = Debug|XBox 360 + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.DebugWin8|Mixed Platforms.Build.0 = Debug|XBox 360 + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.DebugWin8|PS Vita.ActiveCfg = Debug|PS Vita + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.DebugWin8|PS Vita.Build.0 = Debug|PS Vita + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.DebugWin8|Windows.ActiveCfg = Debug|Windows + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.DebugWin8|Windows.Build.0 = Debug|Windows + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.DebugWin8|Windows Metro.ActiveCfg = Debug|Windows Metro + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.DebugWin8|Windows Metro.Build.0 = Debug|Windows Metro + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.DebugWin8|Windows Phone.ActiveCfg = Debug|Windows Phone + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.DebugWin8|Windows Phone.Build.0 = Debug|Windows Phone + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.DebugWin8|x86.ActiveCfg = Debug|XBox 360 + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.DebugWin8|XBox 360.ActiveCfg = Debug|XBox 360 + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.DebugWin8|XBox 360.Build.0 = Debug|XBox 360 + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Android.ActiveCfg = Release|Android + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Android.Build.0 = Release|Android + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Any CPU.ActiveCfg = Release|Android + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|iOS.ActiveCfg = Release|iOS + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|iOS.Build.0 = Release|iOS + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Linux.ActiveCfg = Release|Linux + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Linux.Build.0 = Release|Linux + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Mac OS.ActiveCfg = Release|Mac OS + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Mac OS.Build.0 = Release|Mac OS + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Mixed Platforms.ActiveCfg = Release|XBox 360 + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Mixed Platforms.Build.0 = Release|XBox 360 + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|PS Vita.ActiveCfg = Release|PS Vita + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|PS Vita.Build.0 = Release|PS Vita + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Windows.ActiveCfg = Release|Windows + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Windows.Build.0 = Release|Windows + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Windows Metro.ActiveCfg = Release|Windows Metro + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Windows Metro.Build.0 = Release|Windows Metro + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Windows Phone.ActiveCfg = Release|Windows Phone + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Windows Phone.Build.0 = Release|Windows Phone + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|x86.ActiveCfg = Release|XBox 360 + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|XBox 360.ActiveCfg = Release|XBox 360 + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|XBox 360.Build.0 = Release|XBox 360 + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.ReleaseWin8|Android.ActiveCfg = Release|Android + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.ReleaseWin8|Android.Build.0 = Release|Android + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.ReleaseWin8|Any CPU.ActiveCfg = Release|Android + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.ReleaseWin8|iOS.ActiveCfg = Release|iOS + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.ReleaseWin8|iOS.Build.0 = Release|iOS + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.ReleaseWin8|Linux.ActiveCfg = Release|Linux + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.ReleaseWin8|Linux.Build.0 = Release|Linux + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.ReleaseWin8|Mac OS.ActiveCfg = Release|Mac OS + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.ReleaseWin8|Mac OS.Build.0 = Release|Mac OS + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.ReleaseWin8|Mixed Platforms.ActiveCfg = Release|XBox 360 + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.ReleaseWin8|Mixed Platforms.Build.0 = Release|XBox 360 + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.ReleaseWin8|PS Vita.ActiveCfg = Release|PS Vita + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.ReleaseWin8|PS Vita.Build.0 = Release|PS Vita + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.ReleaseWin8|Windows.ActiveCfg = Release|Windows + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.ReleaseWin8|Windows.Build.0 = Release|Windows + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.ReleaseWin8|Windows Metro.ActiveCfg = Release|Windows Metro + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.ReleaseWin8|Windows Metro.Build.0 = Release|Windows Metro + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.ReleaseWin8|Windows Phone.ActiveCfg = Release|Windows Phone + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.ReleaseWin8|Windows Phone.Build.0 = Release|Windows Phone + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.ReleaseWin8|x86.ActiveCfg = Release|XBox 360 + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.ReleaseWin8|XBox 360.ActiveCfg = Release|XBox 360 + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.ReleaseWin8|XBox 360.Build.0 = Release|XBox 360 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Samples/TextRendering/TextRendering.csproj b/Samples/TextRendering/TextRendering.csproj index 28f9d3bd..b2bce8a6 100644 --- a/Samples/TextRendering/TextRendering.csproj +++ b/Samples/TextRendering/TextRendering.csproj @@ -1,8 +1,8 @@  + {BC79B021-10E4-4D01-945A-7048FFF53A22} - {6D335F3A-9D43-41b4-9D22-F6F17C4BE596};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Debug x86 WinExe @@ -11,11 +11,6 @@ TextRendering v4.0 Client - v4.0 - Windows - HiDef - 5bfa27fd-2df5-47dd-bcaa-ae790bb09eea - Game anx.ico GameThumbnail.png publish\ @@ -45,7 +40,6 @@ true false x86 - false pdbonly @@ -57,7 +51,6 @@ true false x86 - true bin\x86\DebugWin8\ @@ -81,6 +74,9 @@ true false + + Always + @@ -101,35 +97,24 @@ - - {6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35} - ANX.Framework - - - {60D08399-244F-46A3-91F1-4CFD26D961A3} - ANX.InputDevices.Windows.XInput - - - {49066074-3B7B-4A55-B122-6BD33AB73558} - ANX.InputSystem.Standard - - - {068EB2E9-963C-4E1B-8831-E25011F11FFE} - ANX.PlatformSystem.Windows - - - {5BE49183-2F6F-4527-AC90-D816911FCF90} - ANX.RenderSystem.Windows.DX10 - - - {6A582788-C4D2-410C-96CD-177F75712D65} - ANX.SoundSystem.Windows.XAudio - - - {FA6E229D-4504-47B1-8A23-2D3FCC13F778} - SampleContent - Content - + + ..\..\bin\Debug\ANX.Framework.dll + + + ..\..\bin\Debug\ANX.InputDevices.Windows.XInput.dll + + + ..\..\bin\Debug\ANX.InputSystem.Standard.dll + + + ..\..\bin\Debug\ANX.PlatformSystem.Windows.dll + + + ..\..\bin\Debug\ANX.RenderSystem.Windows.DX10.dll + + + ..\..\bin\Debug\ANX.SoundSystem.Windows.XAudio.dll + @@ -152,14 +137,11 @@ Windows Installer 3.1 true - - False - Microsoft XNA Framework Redistributable 4.0 - true - - + + xcopy $(ProjectDir)..\SampleContent\bin\$(ConfigurationName) $(TargetDir)SampleContent\ /D /E /Y +