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

Commitc6d8e45

Browse files
committed
[All] BREAKING CHANGES. Refactor whole building. The full list of changes are:
- Move to .NET 4.5- Use PCL whenever possible.- By default include all DX11/DX11.1/DX11.2.- Remove almost all #if/#else related to DX11/DX11.1/DX11.2.- Freeze generated code for Direct3D9/Direct3D10/DirectSound/DirectInput (They are no longer generated automatically from C++ as we are not going to update them in the future).- Add new defines STORE_APP, DESKTOP_APP
1 parent0581d91 commitc6d8e45

File tree

322 files changed

+1506
-6224
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

322 files changed

+1506
-6224
lines changed

‎Build/SharpDX.PostSettings.targets‎

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,10 @@
44
<PropertyGroupCondition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)'&lt; '11.0'">
55
<VisualStudioVersion>11.0</VisualStudioVersion>
66
</PropertyGroup>
7-
8-
<!--Include automatically SharpDXWP8 interop assembly-->
9-
<ItemGroup>
10-
<ProjectReferenceCondition="'$(SharpDXWP8)' == 'true'"Include="$(SolutionDir)Source\SharpDX.WP8\SharpDX.WP8.vcxproj">
11-
<Name>SharpDX.WP8</Name>
12-
</ProjectReference>
13-
</ItemGroup>
14-
15-
<!--Import Windows 8 WINRT targets only for WIN8 platforms-->
16-
<ImportCondition="'$(SharpDXWin8)' == 'true'"Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
17-
18-
<!--Import Windows Phone 8 targets only for WP8-->
19-
<ImportCondition="'$(SharpDXWP8)' == 'true'"Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).$(TargetFrameworkVersion).Overrides.targets" />
20-
<ImportCondition="'$(SharpDXWP8)' == 'true'"Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).CSharp.targets" />
21-
22-
<PropertyGroupCondition="'$(SharpDXWP81)' == 'true'">
23-
<TargetPlatformIdentifier>WindowsPhoneApp</TargetPlatformIdentifier>
24-
</PropertyGroup>
25-
26-
<!--Import Windows Phone 8.1 targets only for WP81-->
27-
<ImportCondition="'$(SharpDXWP81)' == 'true'"Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
287

298
<!--Import standard targets for all non-Windows(Phone) 8 platforms-->
30-
<ImportCondition="'$(SharpDXWin8Core)' == 'false'"Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
9+
<ImportCondition="'$(SharpDXDesktopOnly)' == 'true'"Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
10+
<ImportCondition="'$(SharpDXDesktopOnly)' == 'false'"Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
3111

3212
<PropertyGroupCondition=" '$(Configuration)' == 'Release'">
3313
<DocumentationFile>$(OutputPath)\$(AssemblyName).xml</DocumentationFile>

‎Build/SharpDX.PreSettings.targets‎

Lines changed: 28 additions & 364 deletions
Large diffs are not rendered by default.

‎Build/SharpDX.build‎

Lines changed: 2 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
<PropertyGroup>
2626
<SharpDXRepo>$(MSBuildThisFileDirectory)..</SharpDXRepo>
2727
<SharDXNugetPackages>$(MSBuildThisFileDirectory)Packages</SharDXNugetPackages>
28-
<SharpDXSolution>$(SharpDXRepo)\SharpDX.sln</SharpDXSolution>
2928
<GitExe>"C:\Program Files (x86)\Git\bin\git.exe"</GitExe>
3029
<ExtensionTasksPath>$(SharpDXRepo)\External\MSBuildExtensionPack\</ExtensionTasksPath>
3130
<BuildSignedSharpDX>true</BuildSignedSharpDX>
@@ -79,25 +78,9 @@
7978

8079
<Target Name="Build">
8180
<!--Build all targets / platforms-->
82-
8381
<Exec Command="RMDIR /Q /S $(SharpDXRepo)\Bin"/>
84-
85-
<CallTarget Targets="BuildSigned" Condition="'$(BuildSignedSharpDX)' == 'true'"/>
86-
<CallTarget Targets="DesktopNet20" />
87-
<CallTarget Targets="DesktopNet40" />
88-
<CallTarget Targets="MetroWin8" />
89-
<CallTarget Targets="DesktopDx112" />
90-
<CallTarget Targets="WP8-x86" />
91-
<CallTarget Targets="WP8-ARM" />
92-
<CallTarget Targets="WP81" />
93-
</Target>
94-
95-
<Target Name="BuildSigned">
96-
<MSBuild Targets="Clean;Build" Projects="$(SharpDXSolution)" Properties="Configuration=Release;Platform=Net20;SharpDXSign=true"/>
97-
<MSBuild Targets="Clean;Build" Projects="$(SharpDXSolution)" Properties="Configuration=Release;Platform=Net40;SharpDXSign=true"/>
98-
<MSBuild Targets="Clean;Build" Projects="$(SharpDXSolution)" Properties="Configuration=Release;Platform=Win8;SharpDXSign=true"/>
99-
<MSBuild Targets="Clean;Build" Projects="$(SharpDXSolution)" Properties="Configuration=Release;Platform=DIRECTX11_2;SharpDXSign=true"/>
100-
<MSBuild Targets="Clean;Build" Projects="$(SharpDXSolution)" Properties="Configuration=Release;Platform=WP81;SharpDXSign=true"/>
82+
<MSBuild Targets="Clean;Build" Projects="$(SharpDXRepo)\SharpDX-Desktop.sln" Properties="Configuration=Release;Platform=Any CPU;SharpDXSign=true"/>
83+
<MSBuild Targets="Clean;Build" Projects="$(SharpDXRepo)\SharpDX-StoreApp.sln" Properties="Configuration=Release;Platform=Any CPU;SharpDXSign=true"/>
10184
</Target>
10285

10386
<!--Custom task for checking certification result (fail or pass), the project is excluded from solution build - needs to be rebuilt manually when needed-->
@@ -149,34 +132,6 @@
149132
<VerifyCertificationResultTask File="$(SharpDXRepo)\Source\CertificationTests\Results\Test.WP81.xml" />
150133
</Target>
151134

152-
<Target Name="DesktopNet20">
153-
<MSBuild Targets="Clean;Build" Projects="$(SharpDXSolution)" Properties="Configuration=Release;Platform=Net20"/>
154-
</Target>
155-
156-
<Target Name="DesktopNet40">
157-
<MSBuild Targets="Clean;Build" Projects="$(SharpDXSolution)" Properties="Configuration=Release;Platform=Net40"/>
158-
</Target>
159-
160-
<Target Name="MetroWin8">
161-
<MSBuild Targets="Clean;Build" Projects="$(SharpDXSolution)" Properties="Configuration=Release;Platform=Win8"/>
162-
</Target>
163-
164-
<Target Name="DesktopDx112">
165-
<MSBuild Targets="Clean;Build" Projects="$(SharpDXSolution)" Properties="Configuration=Release;Platform=DIRECTX11_2"/>
166-
</Target>
167-
168-
<Target Name="WP8-x86">
169-
<MSBuild Targets="Clean;Build" Projects="$(SharpDXSolution)" Properties="Configuration=Release;Platform=WP8-x86"/>
170-
</Target>
171-
172-
<Target Name="WP8-ARM">
173-
<MSBuild Targets="Clean;Build" Projects="$(SharpDXSolution)" Properties="Configuration=Release;Platform=WP8-ARM"/>
174-
</Target>
175-
176-
<Target Name="WP81">
177-
<MSBuild Targets="Clean;Build" Projects="$(SharpDXSolution)" Properties="Configuration=Release;Platform=WP81"/>
178-
</Target>
179-
180135
<Target Name="GitCheckout">
181136
<Exec WorkingDirectory="$(SharpDXRepo)" Command='$(GitExe) checkout --merge "master_integration"'/>
182137
<Exec WorkingDirectory="$(SharpDXRepo)" Command='$(GitExe) pull --rebase origin'/>

0 commit comments

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