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

Commit

Permalink
Converted DirectComposition to the new project system.
Browse files Browse the repository at this point in the history
  • Loading branch information
jkoritzinsky committed Mar 23, 2017
1 parent c10a662 commit 7ff47ce
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 137 deletions.
18 changes: 13 additions & 5 deletions Source/SharpDX.DirectComposition/DesktopDevice.cs
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,12 @@ public static bool GetWindowIsCloaked(IntPtr hwnd)
/// </remarks>
public static void SetWindowIsLayered(IntPtr hwnd, bool isLayered)
{
if (Environment.Is64BitProcess)
{
#if NET45
if (Environment.Is64BitProcess)
#else
if(IntPtr.Size == 8)
#endif
{
IntPtr exStyle = NativeMethods.GetWindowLongPtr(hwnd, NativeMethods.GWL_EXSTYLE);
if (exStyle == IntPtr.Zero)
throw new Win32Exception();
Expand All @@ -115,9 +119,13 @@ public static void SetWindowIsLayered(IntPtr hwnd, bool isLayered)
/// <returns>True if the window has the layered style applied, false otherwise.</returns>
public static bool GetWindowIsLayered(IntPtr hwnd)
{
if (Environment.Is64BitProcess)
{
IntPtr exStyle = NativeMethods.GetWindowLongPtr(hwnd, NativeMethods.GWL_EXSTYLE);
#if NET45
if (Environment.Is64BitProcess)
#else
if (IntPtr.Size == 8)
#endif
{
IntPtr exStyle = NativeMethods.GetWindowLongPtr(hwnd, NativeMethods.GWL_EXSTYLE);
if (exStyle == IntPtr.Zero)
throw new Win32Exception();
return (int)(exStyle.ToInt64() & NativeMethods.WS_EX_LAYERED) == NativeMethods.WS_EX_LAYERED;
Expand Down
5 changes: 0 additions & 5 deletions Source/SharpDX.DirectComposition/Properties/AssemblyInfo.cs

This file was deleted.

100 changes: 23 additions & 77 deletions Source/SharpDX.DirectComposition/SharpDX.DirectComposition.csproj
Original file line number Diff line number Diff line change
@@ -1,88 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$(SolutionDir)Build\SharpDX.props" />
<PropertyGroup>
<SharpDXDesktopOnly>true</SharpDXDesktopOnly>
<TargetFrameworks>net45;netcoreapp1.0;netstandard1.3</TargetFrameworks>
<PackageId>SharpDX.Direct3D9</PackageId>
<Product>SharpDX.Direct3D9</Product>
<AssemblyTitle>SharpDX.Direct3D9</AssemblyTitle>
<Title>SharpDX.Direct3D9</Title>
<Description>Assembly providing DirectX - Direct3D9 managed API.</Description>
<PackageTags>$(PackageTags) Direct3D9 D3D9</PackageTags>
</PropertyGroup>
<Import Project="$(SolutionDir)\Build\SharpDX.PreSettings.targets" />
<PropertyGroup>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{FBE5DD99-00A0-4FED-A116-941A46A0C0D0}</ProjectGuid>
<RootNamespace>SharpDX.DirectComposition</RootNamespace>
<AssemblyName>SharpDX.DirectComposition</AssemblyName>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<PropertyGroup Condition=" '$(TargetFramework)' == 'net45' OR '$(TargetFramework)' == 'netcoreapp1.0' ">
<DefineConstants>$(DefineConstants);DESKTOP_APP</DefineConstants>
<SharpDXAppType>DESKTOP_APP</SharpDXAppType>
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
<DefineConstants>$(DefineConstants);REFERENCE</DefineConstants>
<SharpDXAppType>REFERENCE</SharpDXAppType>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
</ItemGroup>
<ItemGroup>
<None Include="Documentation\CodeComments.xml" />
<None Include="Mapping.xml" />
<Compile Include="..\SharedAssemblyInfo.cs">
<Link>Properties\SharedAssemblyInfo.cs</Link>
</Compile>
<Compile Include="Animation.cs" />
<Compile Include="DesktopDevice.cs" />
<Compile Include="Device.cs" />
<Compile Include="Device2.cs" />
<Compile Include="EffectGroup.cs" />
<Compile Include="MatrixTransform.cs" />
<Compile Include="MatrixTransform3D.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Generated\Enumerations.cs" />
<Compile Include="Generated\Functions.cs" />
<Compile Include="Generated\Interfaces.cs" />
<Compile Include="Generated\LocalInterop.cs" />
<Compile Include="Generated\Structures.cs" />
<Compile Include="RectangleClip.cs" />
<Compile Include="RotateTransform.cs" />
<Compile Include="RotateTransform3D.cs" />
<Compile Include="ScaleTransform.cs" />
<Compile Include="ScaleTransform3D.cs" />
<Compile Include="SkewTransform.cs" />
<Compile Include="Surface.cs" />
<Compile Include="SurfaceFactory.cs" />
<Compile Include="Target.cs" />
<Compile Include="Transform.cs" />
<Compile Include="Transform3D.cs" />
<Compile Include="TranslateTransform.cs" />
<Compile Include="TranslateTransform3D.cs" />
<Compile Include="VirtualSurface.cs" />
<Compile Include="Visual.cs" />
<Compile Include="Visual2.cs" />
</ItemGroup>
<ItemGroup>
<None Include="Mapping.xml" />
</ItemGroup>
<ItemGroup>
<None Include="SharpDX.DirectComposition.nuspec" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\SharpDX.Direct2D1\SharpDX.Direct2D1.csproj">
<Project>{c97878f4-1510-4bba-8153-bd71da7d50d8}</Project>
<Name>SharpDX.Direct2D1</Name>
</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>
</ItemGroup>
<ItemGroup>
<None Include="Documentation\CodeComments.xml" />
<ProjectReference Include="..\SharpDX\SharpDX.csproj" />
<ProjectReference Include="..\SharpDX.DXGI\SharpDX.DXGI.csproj" />
<ProjectReference Include="..\SharpDX.Direct2D1\SharpDX.Direct2D1.csproj" />
</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>
-->

<Import Project="$(SolutionDir)Build\SharpDX.targets" />
</Project>
50 changes: 0 additions & 50 deletions Source/SharpDX.DirectComposition/SharpDX.DirectComposition.nuspec

This file was deleted.

0 comments on commit 7ff47ce

Please sign in to comment.