Skip to content

pull from master #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HopingCoding merged 47 commits into from
Apr 2, 2015
Merged

pull from master #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
6b6c8ab
[Direct3D12] Update sln
xoofx May 14, 2014
370da9f
[Direct3D12] First compiled version (wip)
xoofx May 14, 2014
28bd014
[SharpGen] Generate automatically duplicate methods with raw pointers…
xoofx May 22, 2014
8d54263
[Direct3D12] Add helper methods
xoofx May 22, 2014
070fa52
[Direct3D12] Work on mapping (still issues with alignment of x64 vs x86)
xoofx May 23, 2014
1f614b5
[SharpGen] Output an error when unions cannot be mapped safely in cas…
xoofx May 23, 2014
f2de81a
[Direct3D12] Fix issue with alignment D3D12_RESOURCE_BARRIER_DESC. Pe…
xoofx May 23, 2014
4371fd1
[SharpDX] Added DisposeEventArgs with Disposing flag
pikacc Sep 7, 2014
e050b96
[Effects11] Updated Effects11 sources, rebuilt, fixed issues
pikacc Sep 8, 2014
d107783
[SharpGen] Allow union which contains a pointer only if there are no …
xoofx Oct 3, 2014
32fbb72
[Direct3D12] Add support for latest Direct3D12 from Windows 10
xoofx Oct 3, 2014
472cbc6
[Direct3D12] Implement union that contains pointer differently withou…
xoofx Oct 3, 2014
c973707
[Direct3D12] Add support for new abbreviations
xoofx Oct 3, 2014
a1078b0
[SharpGen] Better handling of RefIn parameter by value
xoofx Oct 14, 2014
8b8c911
[Direct3D12] Cleanup with latest SDK changes (wip)
xoofx Oct 14, 2014
a89e471
Cleanup. Work on RootSignatureDescription/RootParameter.
xoofx Oct 15, 2014
70e1f47
[SharpDX] Add implicit operator from Blob to DataPointer
xoofx Oct 18, 2014
eb43548
[Direct3D12] Add missing API for HelloTriangle (wip, not tested)
xoofx Oct 18, 2014
c4250ad
Merge branch 'master' of https://github.com/sharpdx/SharpDX
pikacc Nov 1, 2014
f9fdb55
Effects11 @ x64 build
OndrejPetrzilka Jan 18, 2015
e648722
+ efefcts 11 binaries (lib, pdb, exp)
OndrejPetrzilka Jan 20, 2015
b311ce4
Merge remote-tracking branch 'fork/master' into master_integration
xoofx Jan 20, 2015
068743e
[Build] Removed unused using directives that were breaking the compil…
ArtiomCiumac Jan 21, 2015
954e541
[Direct3D12] Update to latest Windows 10 SDK
xoofx Mar 26, 2015
56d9792
[Externals] Update Mono.Cecil to latest in order to support VS2015/Ro…
xoofx Mar 27, 2015
ed32f3d
[SharpGen] Don't emit Pack = 0
xoofx Mar 27, 2015
972d638
[Direct3D12] Fix RootSignatureDescription marshaling
xoofx Mar 27, 2015
4218801
[Direct3D12] Use IntPtr instead of void* (originally suspecting a JIT…
xoofx Mar 27, 2015
bff9d0c
[Direct3D12] Fix missing methods in Device.CreateCommandList and Crea…
xoofx Mar 27, 2015
45b246e
Merge branch 'master' into master_integration
xoofx Mar 27, 2015
1b96efc
[Direct3D12] Use of headers from official Windows10 SDK 10041
xoofx Mar 27, 2015
f0fdc9f
[Effects11] Fix mapping.xml
xoofx Mar 28, 2015
0581d91
[Build] Don't remove systematically Generated files now
xoofx Mar 28, 2015
c6d8e45
[All] BREAKING CHANGES. Refactor whole building. The full list of cha…
xoofx Mar 29, 2015
a0405e7
[Direct3D10] Remove support for Direct3D10
xoofx Mar 30, 2015
48be295
[Mathematics] Use legacy namespace to avoid breaking too much samples…
xoofx Mar 30, 2015
266223d
[Desktop] Fix logo in RenderForm
xoofx Mar 30, 2015
f496aa2
[Direct3D11] Use structure instead of generic for SetViewports to avo…
xoofx Mar 30, 2015
3155977
[DXGI] Make sure Output1.DuplicateOutput method is only generated for…
xoofx Mar 30, 2015
8acef9e
[Build] Select correct PCL versions for Desktop and StoreApp
xoofx Mar 31, 2015
e8c673b
[Build] Update nuspec to use 3.0.0 assemblies and restore symbols pac…
xoofx Mar 31, 2015
5e36b60
[Build] Add ReleaseNotes.md. Remove previous RelaeseNotes.html
xoofx Mar 31, 2015
fd816b5
[Samples] Add submodule Samples
xoofx Mar 30, 2015
cad4bf0
[Samples] Add HelloWorld Direct3D12 sample
xoofx Apr 1, 2015
84bee7f
[Build] Update release notes
xoofx Apr 1, 2015
879a776
[Build] Add -alpha01 to generated files. Fix archive creation.
xoofx Apr 1, 2015
2c5fab0
[Samples] Update to latest
xoofx Apr 1, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,5 @@ Temp*/
#ignore build log file
BuildErrors.log
#ignore certification test results
Source/CertificationTests/Results/*
Source/CertificationTests/Results/*
*.tlog
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "Samples"]
path = Samples
url = [email protected]:sharpdx/SharpDX-Samples.git
27 changes: 3 additions & 24 deletions Build/SharpDX.PostSettings.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,9 @@
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '11.0' ">
<VisualStudioVersion>11.0</VisualStudioVersion>
</PropertyGroup>

<!--Include automatically SharpDXWP8 interop assembly-->
<ItemGroup>
<ProjectReference Condition="'$(SharpDXWP8)' == 'true'" Include="$(SolutionDir)Source\SharpDX.WP8\SharpDX.WP8.vcxproj">
<Name>SharpDX.WP8</Name>
</ProjectReference>
</ItemGroup>

<!--Import Windows 8 WINRT targets only for WIN8 platforms-->
<Import Condition="'$(SharpDXWin8)' == 'true'" Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />

<!--Import Windows Phone 8 targets only for WP8 -->
<Import Condition="'$(SharpDXWP8)' == 'true'" Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).$(TargetFrameworkVersion).Overrides.targets" />
<Import Condition="'$(SharpDXWP8)' == 'true'" Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).CSharp.targets" />

<PropertyGroup Condition="'$(SharpDXWP81)' == 'true'">
<TargetPlatformIdentifier>WindowsPhoneApp</TargetPlatformIdentifier>
</PropertyGroup>

<!--Import Windows Phone 8.1 targets only for WP81 -->
<Import Condition="'$(SharpDXWP81)' == 'true'" Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />

<!--Import standard targets for all non-Windows(Phone) 8 platforms-->
<Import Condition="'$(SharpDXWin8Core)' == 'false'" Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!--Import csharp targets -->
<Import Project="$(SharpDXCSharpTargets)" />

<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DocumentationFile>$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
Expand All @@ -36,7 +15,7 @@
<ProjectExtensions/>

<Target Name="BeforeClean">
<RemoveDir Condition="Exists('$(ProjectDir)Generated')" Directories="$(ProjectDir)Generated"/>
<!--<RemoveDir Condition="Exists('$(ProjectDir)Generated')" Directories="$(ProjectDir)Generated"/>-->
</Target>

<Target Name="AfterBuild">
Expand Down
373 changes: 36 additions & 337 deletions Build/SharpDX.PreSettings.targets
View file
Open in desktop

Large diffs are not rendered by default.

58 changes: 7 additions & 51 deletions Build/SharpDX.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
<PropertyGroup>
<SharpDXRepo>$(MSBuildThisFileDirectory)..</SharpDXRepo>
<SharDXNugetPackages>$(MSBuildThisFileDirectory)Packages</SharDXNugetPackages>
<SharpDXSolution>$(SharpDXRepo)\SharpDX.sln</SharpDXSolution>
<GitExe>"C:\Program Files (x86)\Git\bin\git.exe"</GitExe>
<ExtensionTasksPath>$(SharpDXRepo)\External\MSBuildExtensionPack\</ExtensionTasksPath>
<BuildSignedSharpDX>true</BuildSignedSharpDX>
<SharedAssemblyInfoFilePath>$(SharpDXRepo)\Source\SharedAssemblyInfo.cs</SharedAssemblyInfoFilePath>
<SharedAssemblyInfo>$([System.IO.File]::ReadAllText($(SharedAssemblyInfoFilePath)))</SharedAssemblyInfo>
<SharpDXAssemblyVersion>$([System.Text.RegularExpressions.Regex]::Match($(SharedAssemblyInfo), `AssemblyVersion\("(.*)"`).Groups[1].Value)</SharpDXAssemblyVersion>
<SharpDXAssemblyPostFixVersion>-alpha01</SharpDXAssemblyPostFixVersion>
<SharpDXAssemblyVersion>$([System.Text.RegularExpressions.Regex]::Match($(SharedAssemblyInfo), `AssemblyVersion\("(.*)"`).Groups[1].Value)$(SharpDXAssemblyPostFixVersion)</SharpDXAssemblyVersion>
<SharpDXDevZip>$(MSBuildThisFileDirectory)\SharpDX-SDK-LatestDev.exe</SharpDXDevZip>
<SharpDXReleaseZip>$(MSBuildThisFileDirectory)\SharpDX-SDK-$(SharpDXAssemblyVersion).exe</SharpDXReleaseZip>
<SharpDXLocalUpload>C:\inetpub\wwwroot\sharpdx\upload</SharpDXLocalUpload>
Expand Down Expand Up @@ -67,7 +67,7 @@
<ItemGroup>
<SharpDXNuspecs Include="$(SharpDXRepo)\Source\**\*.nuspec"/>
</ItemGroup>
<Exec Command="nuget.exe pack -OutputDirectory $(SharDXNugetPackages) -Properties version=$(SharpDXAssemblyVersion) %(SharpDXNuspecs.Identity)"/>
<Exec Command="nuget.exe pack -OutputDirectory $(SharDXNugetPackages) -Properties version=$(SharpDXAssemblyVersion) -Symbols %(SharpDXNuspecs.Identity)"/>
</Target>

<Target Name="NugetPush">
Expand All @@ -79,25 +79,9 @@

<Target Name="Build">
<!--Build all targets / platforms-->

<Exec Command="RMDIR /Q /S $(SharpDXRepo)\Bin"/>

<CallTarget Targets="BuildSigned" Condition="'$(BuildSignedSharpDX)' == 'true'"/>
<CallTarget Targets="DesktopNet20" />
<CallTarget Targets="DesktopNet40" />
<CallTarget Targets="MetroWin8" />
<CallTarget Targets="DesktopDx112" />
<CallTarget Targets="WP8-x86" />
<CallTarget Targets="WP8-ARM" />
<CallTarget Targets="WP81" />
</Target>

<Target Name="BuildSigned">
<MSBuild Targets="Clean;Build" Projects="$(SharpDXSolution)" Properties="Configuration=Release;Platform=Net20;SharpDXSign=true"/>
<MSBuild Targets="Clean;Build" Projects="$(SharpDXSolution)" Properties="Configuration=Release;Platform=Net40;SharpDXSign=true"/>
<MSBuild Targets="Clean;Build" Projects="$(SharpDXSolution)" Properties="Configuration=Release;Platform=Win8;SharpDXSign=true"/>
<MSBuild Targets="Clean;Build" Projects="$(SharpDXSolution)" Properties="Configuration=Release;Platform=DIRECTX11_2;SharpDXSign=true"/>
<MSBuild Targets="Clean;Build" Projects="$(SharpDXSolution)" Properties="Configuration=Release;Platform=WP81;SharpDXSign=true"/>
<MSBuild Targets="Clean;Build" Projects="$(SharpDXRepo)\SharpDX-Desktop.sln" Properties="Configuration=Release;Platform=Any CPU;SharpDXSign=true"/>
<MSBuild Targets="Clean;Build" Projects="$(SharpDXRepo)\SharpDX-StoreApp.sln" Properties="Configuration=Release;Platform=Any CPU;SharpDXSign=true"/>
</Target>

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

<Target Name="DesktopNet20">
<MSBuild Targets="Clean;Build" Projects="$(SharpDXSolution)" Properties="Configuration=Release;Platform=Net20"/>
</Target>

<Target Name="DesktopNet40">
<MSBuild Targets="Clean;Build" Projects="$(SharpDXSolution)" Properties="Configuration=Release;Platform=Net40"/>
</Target>

<Target Name="MetroWin8">
<MSBuild Targets="Clean;Build" Projects="$(SharpDXSolution)" Properties="Configuration=Release;Platform=Win8"/>
</Target>

<Target Name="DesktopDx112">
<MSBuild Targets="Clean;Build" Projects="$(SharpDXSolution)" Properties="Configuration=Release;Platform=DIRECTX11_2"/>
</Target>

<Target Name="WP8-x86">
<MSBuild Targets="Clean;Build" Projects="$(SharpDXSolution)" Properties="Configuration=Release;Platform=WP8-x86"/>
</Target>

<Target Name="WP8-ARM">
<MSBuild Targets="Clean;Build" Projects="$(SharpDXSolution)" Properties="Configuration=Release;Platform=WP8-ARM"/>
</Target>

<Target Name="WP81">
<MSBuild Targets="Clean;Build" Projects="$(SharpDXSolution)" Properties="Configuration=Release;Platform=WP81"/>
</Target>

<Target Name="GitCheckout">
<Exec WorkingDirectory="$(SharpDXRepo)" Command='$(GitExe) checkout --merge "master_integration"'/>
<Exec WorkingDirectory="$(SharpDXRepo)" Command='$(GitExe) pull --rebase origin'/>
Expand Down Expand Up @@ -212,12 +168,12 @@

<Target Name="ZipBuild">
<Delete Files="$(SharpDXDevZip)"/>
<Exec WorkingDirectory="$(SharpDXRepo)" Command='$(SharpDXRepo)\External\7-Zip\7z.exe a -sfx7z.sfx -xr!External -xr!*.check -xr!*.pdb -xr!*.lib -xr!*.pri -xr!*.exp $(SharpDXDevZip) Bin\*\*.* Build\SharpDX.targets License.txt CommitLog.txt Readme.md'/>
<Exec WorkingDirectory="$(SharpDXRepo)" Command='$(SharpDXRepo)\External\7-Zip\7z.exe a -sfx7z.sfx -xr!External -xr!*.check -xr!*.pdb -xr!*.lib -xr!*.pri -xr!*.exp $(SharpDXDevZip) Bin\*\*.* License.txt ReleaseNotes.md Readme.md'/>
</Target>

<Target Name="ZipRelease">
<Delete Files="$(SharpDXReleaseZip)"/>
<Exec WorkingDirectory="$(SharpDXRepo)" Command='$(SharpDXRepo)\External\7-Zip\7z.exe a -sfx7z.sfx -xr!External -xr!*.check -xr!*.pdb -xr!*.lib -xr!*.pri -xr!*.exp $(SharpDXReleaseZip) Bin\*\*.* Build\SharpDX.targets License.txt ReleaseNotes.html Readme.md'/>
<Exec WorkingDirectory="$(SharpDXRepo)" Command='$(SharpDXRepo)\External\7-Zip\7z.exe a -sfx7z.sfx -xr!External -xr!*.check -xr!*.pdb -xr!*.lib -xr!*.pri -xr!*.exp $(SharpDXReleaseZip) Bin\*\*.* License.txt ReleaseNotes.md Readme.md'/>
</Target>

<Target Name="LocalCopy">
Expand Down
Binary file modified External/Effects11/Bin/sharpdx_direct3d11_1_effects_x64.dll
View file
Open in desktop
Binary file not shown.
Binary file added External/Effects11/Bin/sharpdx_direct3d11_1_effects_x64.exp
View file
Open in desktop
Binary file not shown.
Binary file added External/Effects11/Bin/sharpdx_direct3d11_1_effects_x64.lib
View file
Open in desktop
Binary file not shown.
Binary file added External/Effects11/Bin/sharpdx_direct3d11_1_effects_x64.pdb
View file
Open in desktop
Binary file not shown.
Binary file modified External/Effects11/Bin/sharpdx_direct3d11_1_effects_x86.dll
View file
Open in desktop
Binary file not shown.
Binary file added External/Effects11/Bin/sharpdx_direct3d11_1_effects_x86.exp
View file
Open in desktop
Binary file not shown.
Binary file added External/Effects11/Bin/sharpdx_direct3d11_1_effects_x86.lib
View file
Open in desktop
Binary file not shown.
Binary file added External/Effects11/Bin/sharpdx_direct3d11_1_effects_x86.pdb
View file
Open in desktop
Binary file not shown.
Binary file modified External/Effects11/Bin/sharpdx_direct3d11_effects_x64.dll
View file
Open in desktop
Binary file not shown.
Binary file modified External/Effects11/Bin/sharpdx_direct3d11_effects_x86.dll
View file
Open in desktop
Binary file not shown.
Loading