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

Updated to .NET 4.5.2 and to work with SharpDX 3.0.0 #4

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Updated to .NET 4.5.2 and to work with SharpDX 3.0.0 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
65b766e
Updated to .NET 4.5.2 and to work with SharpDX 3.0.0
Feb 13, 2016
ed2fb21
Fixed issue with fonts (SpriteBatch) and serialization backward compa…
Feb 13, 2016
088d54c
Added missing files (sorry).
Sep 11, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,28 @@ Temp*/
#ignore build log file
BuildErrors.log
#ignore certification test results
Source/CertificationTests/Results/*
Source/CertificationTests/Results/*
/External
/packages
/Source/VisualStudio
/Source/Tools
/Source/Tests
/Source/SharpDX.XInput
/Source/SharpDX.XAudio2
/Source/SharpDX.RawInput
/Source/SharpDX.MediaFoundation
/Source/SharpDX.Mathematics
/Source/SharpDX.DXGI
/Source/SharpDX.DirectSound
/Source/SharpDX.DirectManipulation
/Source/SharpDX.DirectInput
/Source/SharpDX.DirectComposition
/Source/SharpDX.Direct3D9
/Source/SharpDX.Direct3D12
/Source/SharpDX.Direct3D11.Effects
/Source/SharpDX.Direct3D11
/Source/SharpDX.Direct2D1
/Source/SharpDX.Desktop
/Source/SharpDX.D3DCompiler
/Source/SharpDX.Animation
/Source/SharpDX
2,844 changes: 1,598 additions & 1,246 deletions SharpDX.sln
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions SharpDX.sln.DotSettings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,9 @@ THE SOFTWARE.
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PublicFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/VBNaming/EventHandlerPatternLong/@EntryValue">$object$_On$event$</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsCodeFormatterSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=14FEDE5832214E4E81265FA7E9A8F472/@KeyIndexDefined">True</s:Boolean>
<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=14FEDE5832214E4E81265FA7E9A8F472/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
Expand Down
143 changes: 41 additions & 102 deletions Source/Mapping.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,61 +23,29 @@
<config id="sharpdx-root" xmlns="urn:SharpGen.Config">

<ifdef name="DIRECTX11_1">
<ifdef name="WP8">
<!--<include-dir override="true">$(THIS_CONFIG_PATH)\..\External\gccxml\share\gccxml-0.9\vc11\overrides\shared</include-dir>
<include-dir override="true">$(THIS_CONFIG_PATH)\..\External\gccxml\share\gccxml-0.9\vc11\overrides\um</include-dir>
<include-dir override="true">$(THIS_CONFIG_PATH)\..\External\gccxml\share\gccxml-0.9\vc11\overrides</include-dir>-->
<include-dir override="true">$(THIS_CONFIG_PATH)\..\External\gccxml\share\gccxml-0.9\vc11\overrides\wp8</include-dir>-->
<include-dir override="true">$(THIS_CONFIG_PATH)\..\External\gccxml\share\gccxml-0.9\vc11\overrides</include-dir>
<include-dir>=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\11.0\Setup\VC\ProductDir;Include</include-dir>
<include-dir>=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows Phone\v8.0\InstallationFolder;Include</include-dir>
<include-dir>=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows Phone\v8.0\InstallationFolder;Include\abi</include-dir>
<include-dir>=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows Phone\v8.0\InstallationFolder;Include\mincore</include-dir>
<include-dir>=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows Phone\v8.0\InstallationFolder;Include\minwin</include-dir>
<include-dir>=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows Phone\v8.0\InstallationFolder;Include\wrl</include-dir>
</ifdef>

<ifndef name="WP8">

<ifdef name="WP81">
<include-dir override="true">$(THIS_CONFIG_PATH)\..\External\gccxml\share\gccxml-0.9\vc12\overrides</include-dir>
<include-dir override="true">$(THIS_CONFIG_PATH)\..\External\gccxml\share\gccxml-0.9\vc12\overrides\wp81</include-dir>
<include-dir>=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\12.0\Setup\VC\ProductDir;include</include-dir>
<include-dir>=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\WindowsPhoneApp\v8.1\InstallationFolder;Include</include-dir>
<include-dir>=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\WindowsPhoneApp\v8.1\InstallationFolder;Include\abi</include-dir>
<include-dir>=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\WindowsPhoneApp\v8.1\InstallationFolder;Include\mincore</include-dir>
<include-dir>=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\WindowsPhoneApp\v8.1\InstallationFolder;Include\minwin</include-dir>
<include-dir>=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\WindowsPhoneApp\v8.1\InstallationFolder;Include\wrl</include-dir>
</ifdef>

<ifndef name="WP81">

<ifndef name="DIRECTX11_2">
<include-dir override="true">$(THIS_CONFIG_PATH)\..\External\gccxml\share\gccxml-0.9\vc11\overrides\shared</include-dir>
<include-dir override="true">$(THIS_CONFIG_PATH)\..\External\gccxml\share\gccxml-0.9\vc11\overrides\um</include-dir>
<include-dir override="true">$(THIS_CONFIG_PATH)\..\External\gccxml\share\gccxml-0.9\vc11\overrides</include-dir>
<include-dir>=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\11.0\Setup\VC\ProductDir;Include</include-dir>
<include-dir>=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots\KitsRoot;Include\shared</include-dir>
<include-dir>=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots\KitsRoot;Include\um</include-dir>
</ifndef>

<ifdef name="DIRECTX11_2">
<include-dir override="true">$(THIS_CONFIG_PATH)\..\External\gccxml\share\gccxml-0.9\vc12\overrides\shared</include-dir>
<include-dir override="true">$(THIS_CONFIG_PATH)\..\External\gccxml\share\gccxml-0.9\vc12\overrides\um</include-dir>
<include-dir override="true">$(THIS_CONFIG_PATH)\..\External\gccxml\share\gccxml-0.9\vc12\overrides</include-dir>
<include-dir>=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\12.0\Setup\VC\ProductDir;Include</include-dir>
<include-dir>=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots\KitsRoot81;Include\shared</include-dir>
<include-dir>=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots\KitsRoot81;Include\um</include-dir>
</ifdef>
</ifndef>

<ifndef name="DIRECTX11_2">
<include-dir override="true">$(THIS_CONFIG_PATH)\..\External\gccxml\share\gccxml-0.9\vc12\overrides\shared</include-dir>
<include-dir override="true">$(THIS_CONFIG_PATH)\..\External\gccxml\share\gccxml-0.9\vc12\overrides\um</include-dir>
<include-dir override="true">$(THIS_CONFIG_PATH)\..\External\gccxml\share\gccxml-0.9\vc12\overrides</include-dir>
<include-dir>=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\12.0\Setup\VC\ProductDir;Include</include-dir>
<include-dir>=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots\KitsRoot10;Include\10.0.10586.0\shared</include-dir>
<include-dir>=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots\KitsRoot10;Include\10.0.10586.0\um</include-dir>
</ifndef>

<ifdef name="DIRECTX11_2">
<include-dir override="true">$(THIS_CONFIG_PATH)\..\External\gccxml\share\gccxml-0.9\vc12\overrides\shared</include-dir>
<include-dir override="true">$(THIS_CONFIG_PATH)\..\External\gccxml\share\gccxml-0.9\vc12\overrides\um</include-dir>
<include-dir override="true">$(THIS_CONFIG_PATH)\..\External\gccxml\share\gccxml-0.9\vc12\overrides</include-dir>
<include-dir>=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\12.0\Setup\VC\ProductDir;Include</include-dir>
<include-dir>=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots\KitsRoot10;Include\10.0.10586.0\shared</include-dir>
<include-dir>=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots\KitsRoot10;Include\10.0.10586.0\um</include-dir>
</ifdef>

</ifdef>

<ifndef name="W8CORE">
<!-- Add DirectX SDK by default -->
<include-dir>$(DXSDK_DIR)\include</include-dir>
</ifndef>
<!-- Add DirectX SDK by default -->
<include-dir>$(DXSDK_DIR)\include</include-dir>

<ifndef name="DIRECTX11_1">
<include-dir override="true">$(THIS_CONFIG_PATH)\..\External\gccxml\share\gccxml-0.9\vc10\Include</include-dir>
Expand Down Expand Up @@ -109,20 +77,6 @@
</ifdef>
</ifdef>

<ifdef name="WP8">
<include-prolog>
// For WP8 we need to force to use include headers for WPPhone App only
#define WINAPI_FAMILY WINAPI_FAMILY_PHONE_APP
</include-prolog>
</ifdef>

<ifdef name="WP81">
<include-prolog>
// For WP8.1 we need to force to use include headers for MetroApp only
#define WINAPI_FAMILY WINAPI_FAMILY_PHONE_APP
</include-prolog>
</ifdef>

<!-- Include prolog for GCC-XML -->
<include-prolog>
// Use unicode
Expand All @@ -137,66 +91,51 @@
#define __unaligned __attribute((__unaligned))
</include-prolog>

<ifndef name="WP8">
<include-prolog>
enum __SAL_YesNo {};
</include-prolog>
</ifndef>

<!-- Reference Mapping Files -->

<!-- All platforms -->
<file>SharpDX\Mapping.xml</file>
<file>SharpDX.DXGI\Mapping.xml</file>

<ifndef name="WP8">
<file>SharpDX.D3DCompiler\Mapping.xml</file>
</ifndef>
<file>SharpDX.D3DCompiler\Mapping.xml</file>

<!-- All platforms -->
<file>Mapping.Direct3D1x.xml</file>

<!-- Only Desktop -->
<!-- Only Desktop
<ifndef name="W8CORE">
<file>SharpDX.Direct3D10\Mapping.xml</file>
</ifndef>
</ifndef>-->

<!--All platforms -->
<file>SharpDX.Direct3D11\Mapping.xml</file>

<!-- Desktop only -->
<ifndef name="W8CORE">
<file>SharpDX.Direct3D11.Effects\Mapping.xml</file>
<file>SharpDX.Direct3D11.Effects\Mapping.xml</file>

<!--Only Desktop and DirectX 11.1/11.x -->
<ifdef name="DIRECTX11_1|DIRECTX11_2">
<file>SharpDX.Animation\Mapping.xml</file>
<file>SharpDX.DirectComposition\Mapping.xml</file>
<file>SharpDX.DirectManipulation\Mapping.xml</file>
</ifdef>
<!--Only Desktop and DirectX 11.1/11.x -->
<ifdef name="DIRECTX11_1|DIRECTX11_2">
<file>SharpDX.Animation\Mapping.xml</file>
<file>SharpDX.DirectComposition\Mapping.xml</file>
<file>SharpDX.DirectManipulation\Mapping.xml</file>
</ifdef>

<file>SharpDX.Direct3D9\Mapping.xml</file>
</ifndef>
<file>SharpDX.Direct3D9\Mapping.xml</file>

<!-- All platforms -->
<file>SharpDX.XAudio2\Mapping.xml</file>
<file>SharpDX.MediaFoundation\Mapping.xml</file>

<!-- Specifics -->
<ifndef name="WP8">
<file>SharpDX.Direct2D1\Mapping.xml</file>

<!-- Available only desktop prior DirectX11.1 -->
<ifndef name="DIRECTX11_1">
<file>SharpDX.DirectInput\Mapping.xml</file>
<file>SharpDX.DirectSound\Mapping.xml</file>
<file>SharpDX.XACT3\Mapping.xml</file>
</ifndef>

<!-- Available on all platforms except WP8, WP81 -->
<ifndef name="WP81">
<file>SharpDX.XInput\Mapping.xml</file>
<file>SharpDX.RawInput\Mapping.xml</file>
</ifndef>
<file>SharpDX.Direct2D1\Mapping.xml</file>

<!-- Available only desktop prior DirectX11.1 -->
<ifndef name="DIRECTX11_1">
<file>SharpDX.DirectInput\Mapping.xml</file>
<file>SharpDX.DirectSound\Mapping.xml</file>
<!--<file>SharpDX.XACT3\Mapping.xml</file>-->
</ifndef>

<!-- Available on all platforms -->
<file>SharpDX.XInput\Mapping.xml</file>
<file>SharpDX.RawInput\Mapping.xml</file>
</config>
10 changes: 0 additions & 10 deletions Source/Tests/SharpDX.Toolkit.Graphics.Tests/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,6 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.

using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Runtime.InteropServices;
using SharpDX.Direct3D;
using SharpDX.Direct3D11;
using SharpDX.IO;
using SharpDX.WIC;

namespace SharpDX.Toolkit.Graphics.Tests
{
public class Program
Expand Down
Loading