Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings
This repository was archived by the owner on Mar 30, 2019. It is now read-only.
/SharpDXPublic archive

Commit7ff47ce

Browse files
committed
Converted DirectComposition to the new project system.
1 parentc10a662 commit7ff47ce

File tree

4 files changed

+36
-137
lines changed

4 files changed

+36
-137
lines changed

‎Source/SharpDX.DirectComposition/DesktopDevice.cs‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,12 @@ public static bool GetWindowIsCloaked(IntPtr hwnd)
8888
/// </remarks>
8989
publicstaticvoidSetWindowIsLayered(IntPtrhwnd,boolisLayered)
9090
{
91-
if(Environment.Is64BitProcess)
92-
{
91+
#ifNET45
92+
if(Environment.Is64BitProcess)
93+
#else
94+
if(IntPtr.Size==8)
95+
#endif
96+
{
9397
IntPtrexStyle=NativeMethods.GetWindowLongPtr(hwnd,NativeMethods.GWL_EXSTYLE);
9498
if(exStyle==IntPtr.Zero)
9599
thrownewWin32Exception();
@@ -115,9 +119,13 @@ public static void SetWindowIsLayered(IntPtr hwnd, bool isLayered)
115119
/// <returns>True if the window has the layered style applied, false otherwise.</returns>
116120
publicstaticboolGetWindowIsLayered(IntPtrhwnd)
117121
{
118-
if(Environment.Is64BitProcess)
119-
{
120-
IntPtrexStyle=NativeMethods.GetWindowLongPtr(hwnd,NativeMethods.GWL_EXSTYLE);
122+
#ifNET45
123+
if(Environment.Is64BitProcess)
124+
#else
125+
if(IntPtr.Size==8)
126+
#endif
127+
{
128+
IntPtrexStyle=NativeMethods.GetWindowLongPtr(hwnd,NativeMethods.GWL_EXSTYLE);
121129
if(exStyle==IntPtr.Zero)
122130
thrownewWin32Exception();
123131
return(int)(exStyle.ToInt64()&NativeMethods.WS_EX_LAYERED)==NativeMethods.WS_EX_LAYERED;

‎Source/SharpDX.DirectComposition/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 5 deletions
This file was deleted.
Lines changed: 23 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1,88 +1,34 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<ProjectToolsVersion="12.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<ProjectSdk="Microsoft.NET.Sdk">
2+
<ImportProject="$(SolutionDir)Build\SharpDX.props" />
33
<PropertyGroup>
4-
<SharpDXDesktopOnly>true</SharpDXDesktopOnly>
4+
<TargetFrameworks>net45;netcoreapp1.0;netstandard1.3</TargetFrameworks>
5+
<PackageId>SharpDX.Direct3D9</PackageId>
6+
<Product>SharpDX.Direct3D9</Product>
7+
<AssemblyTitle>SharpDX.Direct3D9</AssemblyTitle>
8+
<Title>SharpDX.Direct3D9</Title>
9+
<Description>Assembly providing DirectX - Direct3D9 managed API.</Description>
10+
<PackageTags>$(PackageTags) Direct3D9 D3D9</PackageTags>
511
</PropertyGroup>
6-
<ImportProject="$(SolutionDir)\Build\SharpDX.PreSettings.targets" />
7-
<PropertyGroup>
8-
<ProductVersion>8.0.30703</ProductVersion>
9-
<SchemaVersion>2.0</SchemaVersion>
10-
<ProjectGuid>{FBE5DD99-00A0-4FED-A116-941A46A0C0D0}</ProjectGuid>
11-
<RootNamespace>SharpDX.DirectComposition</RootNamespace>
12-
<AssemblyName>SharpDX.DirectComposition</AssemblyName>
13-
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
12+
<PropertyGroupCondition=" '$(TargetFramework)' == 'net45' OR '$(TargetFramework)' == 'netcoreapp1.0'">
13+
<DefineConstants>$(DefineConstants);DESKTOP_APP</DefineConstants>
14+
<SharpDXAppType>DESKTOP_APP</SharpDXAppType>
15+
</PropertyGroup>
16+
<PropertyGroupCondition=" '$(TargetFramework)' == 'netstandard1.3'">
17+
<DefineConstants>$(DefineConstants);REFERENCE</DefineConstants>
18+
<SharpDXAppType>REFERENCE</SharpDXAppType>
1419
</PropertyGroup>
1520
<ItemGroup>
16-
<ReferenceInclude="System" />
17-
<ReferenceInclude="System.Data" />
18-
<ReferenceInclude="System.Drawing" />
19-
<ReferenceInclude="System.Windows.Forms" />
20-
</ItemGroup>
21-
<ItemGroup>
21+
<NoneInclude="Documentation\CodeComments.xml" />
22+
<NoneInclude="Mapping.xml" />
2223
<CompileInclude="..\SharedAssemblyInfo.cs">
2324
<Link>Properties\SharedAssemblyInfo.cs</Link>
2425
</Compile>
25-
<CompileInclude="Animation.cs" />
26-
<CompileInclude="DesktopDevice.cs" />
27-
<CompileInclude="Device.cs" />
28-
<CompileInclude="Device2.cs" />
29-
<CompileInclude="EffectGroup.cs" />
30-
<CompileInclude="MatrixTransform.cs" />
31-
<CompileInclude="MatrixTransform3D.cs" />
32-
<CompileInclude="Properties\AssemblyInfo.cs" />
33-
<CompileInclude="Generated\Enumerations.cs" />
34-
<CompileInclude="Generated\Functions.cs" />
35-
<CompileInclude="Generated\Interfaces.cs" />
36-
<CompileInclude="Generated\LocalInterop.cs" />
37-
<CompileInclude="Generated\Structures.cs" />
38-
<CompileInclude="RectangleClip.cs" />
39-
<CompileInclude="RotateTransform.cs" />
40-
<CompileInclude="RotateTransform3D.cs" />
41-
<CompileInclude="ScaleTransform.cs" />
42-
<CompileInclude="ScaleTransform3D.cs" />
43-
<CompileInclude="SkewTransform.cs" />
44-
<CompileInclude="Surface.cs" />
45-
<CompileInclude="SurfaceFactory.cs" />
46-
<CompileInclude="Target.cs" />
47-
<CompileInclude="Transform.cs" />
48-
<CompileInclude="Transform3D.cs" />
49-
<CompileInclude="TranslateTransform.cs" />
50-
<CompileInclude="TranslateTransform3D.cs" />
51-
<CompileInclude="VirtualSurface.cs" />
52-
<CompileInclude="Visual.cs" />
53-
<CompileInclude="Visual2.cs" />
54-
</ItemGroup>
55-
<ItemGroup>
56-
<NoneInclude="Mapping.xml" />
57-
</ItemGroup>
58-
<ItemGroup>
59-
<NoneInclude="SharpDX.DirectComposition.nuspec" />
6026
</ItemGroup>
6127
<ItemGroup>
62-
<ProjectReferenceInclude="..\SharpDX.Direct2D1\SharpDX.Direct2D1.csproj">
63-
<Project>{c97878f4-1510-4bba-8153-bd71da7d50d8}</Project>
64-
<Name>SharpDX.Direct2D1</Name>
65-
</ProjectReference>
66-
<ProjectReferenceInclude="..\SharpDX.DXGI\SharpDX.DXGI.csproj">
67-
<Project>{3fc6de77-b412-4101-9e64-6b9aa831179b}</Project>
68-
<Name>SharpDX.DXGI</Name>
69-
<Private>False</Private>
70-
</ProjectReference>
71-
<ProjectReferenceInclude="..\SharpDX\SharpDX.csproj">
72-
<Project>{d0bcd56a-41c4-4a4e-8590-26864ced07ff}</Project>
73-
<Name>SharpDX</Name>
74-
<Private>False</Private>
75-
</ProjectReference>
76-
</ItemGroup>
77-
<ItemGroup>
78-
<NoneInclude="Documentation\CodeComments.xml" />
28+
<ProjectReferenceInclude="..\SharpDX\SharpDX.csproj" />
29+
<ProjectReferenceInclude="..\SharpDX.DXGI\SharpDX.DXGI.csproj" />
30+
<ProjectReferenceInclude="..\SharpDX.Direct2D1\SharpDX.Direct2D1.csproj" />
7931
</ItemGroup>
80-
<ImportProject="$(SolutionDir)\Build\SharpDX.PostSettings.targets" />
81-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
82-
Other similar extension points exist, see Microsoft.Common.targets.
83-
<Target Name="BeforeBuild">
84-
</Target>
85-
<Target Name="AfterBuild">
86-
</Target>
87-
-->
32+
33+
<ImportProject="$(SolutionDir)Build\SharpDX.targets" />
8834
</Project>

‎Source/SharpDX.DirectComposition/SharpDX.DirectComposition.nuspec‎

Lines changed: 0 additions & 50 deletions
This file was deleted.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp