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

Commit4b827d7

Browse files
committed
Changed base package to use new project system. Currently builds on .net45 and netstandard1.1
1 parent18affc7 commit4b827d7

File tree

2 files changed

+41
-149
lines changed

2 files changed

+41
-149
lines changed

‎Source/SharpDX/SharpDX.csproj‎

Lines changed: 28 additions & 149 deletions
Original file line numberDiff line numberDiff line change
@@ -1,163 +1,42 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<ProjectToolsVersion="4.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<ImportProject="$(SolutionDir)\Build\SharpDX.PreSettings.targets" />
1+
<ProjectSdk="Microsoft.NET.Sdk">
42
<PropertyGroup>
5-
<ProductVersion>8.0.30703</ProductVersion>
6-
<SchemaVersion>2.0</SchemaVersion>
7-
<ProjectGuid>{D0BCD56A-41C4-4A4E-8590-26864CED07FF}</ProjectGuid>
8-
<RootNamespace>SharpDX</RootNamespace>
9-
<AssemblyName>SharpDX</AssemblyName>
3+
<TargetFrameworks>net45;netstandard1.1</TargetFrameworks>
104
<!-- Disable FastUpToDate check in order to let VS to always run BeforeBuild.
115
Related to this issue http://connect.microsoft.com/VisualStudio/feedback/details/735718/visual-studio-2011-beta-is-incorrectly-building-solution-->
126
<DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
7+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
8+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
9+
<DebugType>full</DebugType>
10+
<DefineConstants>$(DefineConstants);DIRECTX11_1;DIRECTX11_2;DirectX12</DefineConstants>
11+
12+
<PackageId>SharpDX</PackageId>
13+
<PackageIconUrl>http://sharpdx.org/logo_100x100.png</PackageIconUrl>
14+
<PackageLicenseUrl>http://sharpdx.org/License.txt</PackageLicenseUrl>
15+
<PackageProjectUrl>http://sharpdx.org</PackageProjectUrl>
16+
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
17+
<PackageTags>SharpDX DirectX Direct3D Multimedia MDX 3D</PackageTags>
18+
<Title>SharpDX</Title>
19+
<Authors>Alexandre Mutel</Authors>
20+
<Owners>Alexandre Mutel</Owners>
21+
<Copyright>Copyright (c) 2010-2014 Alexandre Mutel</Copyright>
22+
<Description>Core assembly for all SharpDX assemblies.</Description>
1323
</PropertyGroup>
1424
<ItemGroup>
25+
<NoneInclude="Mapping-core.xml" />
26+
<NoneInclude="Direct3D\Mapping.xml" />
27+
<NoneInclude="Documentation\CodeComments.xml" />
28+
<NoneInclude="Mapping.xml" />
29+
<NoneInclude="Multimedia\Mapping.xml" />
30+
<NoneInclude="SharpDX.nuspec" />
1531
<CompileInclude="..\SharedAssemblyInfo.cs">
1632
<Link>Properties\SharedAssemblyInfo.cs</Link>
1733
</Compile>
18-
<CompileInclude="Direct3D\CompilationException.cs" />
19-
<CompileInclude="Direct3D\CompilationResultBase.cs" />
20-
<CompileInclude="Mathematics\Interop\RawBox.cs" />
21-
<CompileInclude="Mathematics\Interop\RawMatrix4x3.cs" />
22-
<CompileInclude="Mathematics\Interop\RawMatrix5x4.cs" />
23-
<CompileInclude="Mathematics\Interop\RawPlane.cs" />
24-
<CompileInclude="Mathematics\Interop\RawBool.cs" />
25-
<CompileInclude="Mathematics\Interop\RawBool4.cs" />
26-
<CompileInclude="CallbackBase.cs" />
27-
<CompileInclude="Collections\EqualityComparer.cs" />
28-
<CompileInclude="Mathematics\Interop\RawColor3.cs" />
29-
<CompileInclude="Mathematics\Interop\RawColor4.cs" />
30-
<CompileInclude="Mathematics\Interop\RawColorBGRA.cs" />
31-
<CompileInclude="DisposeEventArgs.cs" />
32-
<CompileInclude="Direct3D\Blob.cs" />
33-
<CompileInclude="Mathematics\Interop\RawInt3.cs" />
34-
<CompileInclude="Mathematics\Interop\RawInt4.cs" />
35-
<CompileInclude="Mathematics\Interop\RawMatrix.cs" />
36-
<CompileInclude="Mathematics\Interop\RawMatrix3x2.cs" />
37-
<CompileInclude="Mathematics\Interop\RawQuaternion.cs" />
38-
<CompileInclude="Mathematics\Interop\RawRectangleF.cs" />
39-
<CompileInclude="ModuleInit.cs" />
40-
<CompileInclude="Mathematics\Interop\RawPoint.cs" />
41-
<CompileInclude="Mathematics\Interop\RawRectangle.cs" />
42-
<CompileInclude="Reflection\ObfuscationAttributes.cs" />
43-
<CompileInclude="ComArray.cs" />
44-
<CompileInclude="AssemblyDoc.cs" />
45-
<CompileInclude="IInspectable.cs" />
46-
<CompileInclude="InspectableShadow.cs" />
47-
<CompileInclude="ServiceEventArgs.cs" />
48-
<CompileInclude="DataPointer.cs" />
49-
<CompileInclude="Diagnostics\NamespaceDoc.cs" />
50-
<CompileInclude="Direct3D\NamespaceDoc.cs" />
51-
<CompileInclude="DisposeCollector.cs" />
52-
<CompileInclude="IO\NamespaceDoc.cs" />
53-
<CompileInclude="Multimedia\AudioEndpointRole.cs" />
54-
<CompileInclude="Multimedia\NamespaceDoc.cs" />
55-
<CompileInclude="ShadowAttribute.cs" />
56-
<CompileInclude="ResultDescriptor.cs" />
57-
<CompileInclude="IO\NativeFile.cs" />
58-
<CompileInclude="IO\NativeFileStream.cs" />
59-
<CompileInclude="IO\NativeFileAccess.cs" />
60-
<CompileInclude="IO\NativeFileOptions.cs" />
61-
<CompileInclude="IO\NativeFileMode.cs" />
62-
<CompileInclude="IO\NativeFileShare.cs" />
63-
<CompileInclude="ShadowContainer.cs" />
64-
<CompileInclude="ComBaseStreamNative.cs" />
65-
<CompileInclude="ComObject.cs" />
66-
<CompileInclude="ComObjectCallback.cs" />
67-
<CompileInclude="ComObjectShadow.cs" />
68-
<CompileInclude="Configuration.cs" />
69-
<CompileInclude="CppObject.cs" />
70-
<CompileInclude="CppObjectShadow.cs" />
71-
<CompileInclude="CppObjectVtbl.cs" />
72-
<CompileInclude="DataBox.cs" />
73-
<CompileInclude="DataRectangle.cs" />
74-
<CompileInclude="DataStream.cs" />
75-
<CompileInclude="DataBuffer.cs" />
76-
<CompileInclude="Diagnostics\ObjectReference.cs" />
77-
<CompileInclude="Diagnostics\ObjectTracker.cs" />
78-
<CompileInclude="DisposeBase.cs" />
79-
<CompileInclude="FunctionCallback.cs" />
80-
<CompileInclude="Generated\Direct3D\Enumerations.cs" />
81-
<CompileInclude="Generated\Direct3D\Functions.cs" />
82-
<CompileInclude="Generated\Direct3D\Interfaces.cs" />
83-
<CompileInclude="Generated\Direct3D\Structures.cs" />
84-
<CompileInclude="Generated\LocalInterop.cs" />
85-
<CompileInclude="Generated\Multimedia\Enumerations.cs" />
86-
<CompileInclude="Generated\Win32\Enumerations.cs" />
87-
<CompileInclude="Generated\Win32\Functions.cs" />
88-
<CompileInclude="Generated\Win32\Interfaces.cs" />
89-
<CompileInclude="Generated\Win32\Structures.cs" />
90-
<CompileInclude="ICallbackable.cs" />
91-
<CompileInclude="Interop.cs" />
92-
<CompileInclude="IUnknown.cs" />
93-
<CompileInclude="Multimedia\SoundStream.cs" />
94-
<CompileInclude="Multimedia\WaveFormatAdpcm.cs" />
95-
<CompileInclude="Multimedia\FourCC.cs" />
96-
<CompileInclude="Multimedia\RiffChunk.cs" />
97-
<CompileInclude="Multimedia\RiffParser.cs" />
98-
<CompileInclude="Multimedia\SpeakersExtensions.cs" />
99-
<CompileInclude="Multimedia\WaveFormat.cs" />
100-
<CompileInclude="Multimedia\WaveFormatExtensible.cs" />
101-
<CompileInclude="NamespaceDoc.cs" />
102-
<CompileInclude="Size2.cs" />
103-
<CompileInclude="Size2F.cs" />
104-
<CompileInclude="TagAttribute.cs" />
105-
<CompileInclude="Text\ASCIIEncoding.cs" />
106-
<CompileInclude="Text\NamespaceDoc.cs" />
107-
<CompileInclude="Mathematics\Interop\RawVector2.cs" />
108-
<CompileInclude="Mathematics\Interop\RawVector3.cs" />
109-
<CompileInclude="Mathematics\Interop\RawVector4.cs" />
110-
<CompileInclude="Mathematics\Interop\RawViewport.cs" />
111-
<CompileInclude="Mathematics\Interop\RawViewportF.cs" />
112-
<CompileInclude="Properties\AssemblyInfo.cs" />
113-
<CompileInclude="Result.cs" />
114-
<CompileInclude="Direct3D\ShaderMacro.cs" />
115-
<CompileInclude="PointerSize.cs" />
116-
<CompileInclude="SharpDXException.cs" />
117-
<CompileInclude="Utilities.cs" />
118-
<CompileInclude="Win32\BitmapInfoHeader.cs" />
119-
<CompileInclude="Win32\ComStream.cs" />
120-
<CompileInclude="Win32\ComStreamProxy.cs" />
121-
<CompileInclude="Win32\ComStreamShadow.cs" />
122-
<CompileInclude="Win32\ComStreamBaseShadow.cs" />
123-
<CompileInclude="Win32\ErrorCode.cs" />
124-
<CompileInclude="Win32\NamespaceDoc.cs" />
125-
<CompileInclude="Win32\NativeMessage.cs" />
126-
<CompileInclude="Win32\PropertyBag.cs" />
127-
<CompileInclude="Win32\IStream.cs" />
128-
<CompileInclude="Win32\IStreamBase.cs" />
129-
<CompileInclude="Win32\PropertyBagKey.cs" />
130-
<CompileInclude="Win32\ComStringEnumerator.cs" />
131-
<CompileInclude="Win32\SecurityAttributes.cs" />
132-
<CompileInclude="Win32\Variant.cs" />
133-
<CompileInclude="Win32\VariantElementType.cs" />
134-
<CompileInclude="Win32\VariantType.cs" />
135-
</ItemGroup>
136-
<ItemGroup>
137-
<NoneInclude="Mapping-core.xml">
138-
<SubType>Designer</SubType>
139-
</None>
140-
<NoneInclude="Direct3D\Mapping.xml">
141-
<SubType>Designer</SubType>
142-
</None>
143-
<NoneInclude="Documentation\CodeComments.xml" />
144-
<NoneInclude="Mapping.xml">
145-
<SubType>Designer</SubType>
146-
</None>
147-
<NoneInclude="Multimedia\Mapping.xml">
148-
<SubType>Designer</SubType>
149-
</None>
150-
<NoneInclude="SharpDX.nuspec" />
15134
</ItemGroup>
152-
<ItemGroup />
153-
<ImportProject="$(SolutionDir)\Build\SharpDX.PostSettings.targets" />
154-
<TargetName="BeforeBuild">
35+
36+
<TargetName="RunGenerator"BeforeTargets="BeforeBuild">
15537
<ExecCommand="&quot;$(SolutionDir)Source\Tools\SharpGen\RunGenerator.bat&quot; $(ConfigurationName)" />
15638
</Target>
157-
<!--
158-
To modify your build process, add your task inside one of the targets below and uncomment it.
159-
Other similar extension points exist, see Microsoft.Common.targets.
160-
<Target Name="AfterBuild">
39+
<TargetName="PatchAssembly"AfterTargets="AfterBuild">
40+
<ExecCommand="&quot;$(SolutionDir)\Source\Bin\SharpCLI.exe&quot;&quot;$(TargetPath)&quot;" />
16141
</Target>
162-
-->
16342
</Project>

‎Source/SharpDX/SharpJit.cs‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ namespace SharpDX
2828
internalclassSharpJit
2929
{
3030

31+
#if!NETSTANDARD1_1
3132
privatestaticbyte[]clrCallToStdcallX86Prolog=newbyte[]
3233
{
3334
// 0000058 pop eax
@@ -50,19 +51,26 @@ internal class SharpJit
5051
0xff,0x21
5152
};
5253

54+
#endif
55+
5356
staticSharpJit()
5457
{
5558
Install(typeof(SharpJit));
5659
}
5760

5861
publicstaticvoidInstall(Assemblyassembly)
5962
{
63+
#if!NETSTANDARD1_1
6064
foreach(vartypeinassembly.GetTypes())
6165
Install(type);
66+
#else
67+
thrownewPlatformNotSupportedException();
68+
#endif
6269
}
6370

6471
publicstaticvoidInstall(TypetypeToPatch)
6572
{
73+
#if!NETSTANDARD1_1
6674
unsafe
6775
{
6876
void*test;
@@ -85,8 +93,12 @@ public static void Install(Type typeToPatch)
8593
}
8694
}
8795
}
96+
#else
97+
thrownewPlatformNotSupportedException();
98+
#endif
8899
}
89100

101+
#if!NETSTANDARD1_1
90102
privatestaticvoidEmitTrampoline(MethodInfomethod,byte[]asmCode)
91103
{
92104
RuntimeHelpers.PrepareMethod(method.MethodHandle);
@@ -99,6 +111,7 @@ private static void EmitTrampoline(MethodInfo method, byte[] asmCode)
99111
//00000ff 21 jmp ecx
100112
0xff,0xe1,
101113
};
114+
#endif
102115
}
103116
}
104117

0 commit comments

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