CHANGELOG

Fix assimp file copy per target
mrvux · Feb 17, 2018 · 6ca91dd · 6ca91dd
1 parent d09899c
commit 6ca91dd
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 137 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,7 @@
 ChangeLog
 =========
 
-# Upcoming
+# 1.2
 * [General] Pack version info is now integrated, which allows to use pack versioning feature (as well as diffing).
 * [Help] Kinect 2 nodes now all have help patches as well, so now every node in the pack has a help file.
 * [Nodes] Fix spelling on Frustum (Transform)

diff --git a/Core/VVVV.DX11.Lib/VVVV.DX11.Lib.csproj b/Core/VVVV.DX11.Lib/VVVV.DX11.Lib.csproj
@@ -174,13 +174,16 @@
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
+  <ItemGroup  Condition="'$(Platform)' == 'x64'" >
     <Content Include="..\..\Dependencies\x64\Assimp64.dll">
       <Link>Assimp64.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+  </ItemGroup>
+  <ItemGroup  Condition="'$(Platform)' == 'x86'" >
     <Content Include="..\..\Dependencies\x86\Assimp32.dll">
       <Link>Assimp32.dll</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/MISSINGHELP.md b/MISSINGHELP.md
@@ -3,137 +3,8 @@ Missing Help patches
 
 This is a reported list of missing help patches, per library.
 
-Formatted from last test report
+----
 
-# Nodes
-* Renderer (DX11 MRT)
-* BufferData (DX11.RawBuffer)
-* IndexIndirect (DX11.Drawer Buffer)
-* VertexIndirect (DX11.Drawer Buffer)
-* AttachDispatcher (DX11.Layer)
-* PassApply (DX11.Layer)
-* ClearPipeline (DX11.Layer)
-* PreservePipeline (DX11.Layer)
-* PreferTechnique (DX11.Layer)
-* ViewportArray (DX11.Layer)
-* BlendFactor (DX11.Layer Legacy)
-* StencilReference (DX11.Layer Legacy)
-* ResetCounter (DX11.Layer)
-* ReadonlyDepth (DX11.Layer)
-* ViewportBillBoard (DX11.Layer Advanced)
-* Renderer (DX11 Buffer.Raw)
-* Renderer (DX11 StreamOut)
-* BlendTarget (DX11.RenderState Advanced)
-* RenderState (DX11)
-* Anisotropic (DX11 Sampler)
-* Sampler (DX11)
-* DynamicTexture (DX11.Texture 1d Color)
-* Info (DX11.Texture 1d)
-* PixelData (DX11.Texture 2d)
-* GetSlice (DX11.DepthTextureArray)
-* SetSlice (DX11.Texture2D)
-* RemoveSlice (DX11.Validator)
-* ReadBack (DX11.Buffer Region)
-* RawIndexBuffer (DX11 Geometry)
-* ReadBack (DX11.Buffer)
-* ReadBack (DX11.Buffer Raw)
-* CopyCounter (DX11.Buffer)
-* GeometryBuffer (DX11.Geometry Join)
-* IndexedGeometryBuffer (DX11.Geometry Join)
-* IndexIndirect (DX11.Drawer)
-* Mesh (DX11.Geometry Join Subsets)
-* QuadCross (DX11.Geometry)
-* VertexIndirect (DX11.Drawer)
-* VertexInstancer (DX11.Drawer)
-* Quad (DX11.Layer)
-* Geometry (DX11.Layer)
-* Semantics (DX11.Layer)
-* Blend (DX11.RenderState Advanced)
-* DepthStencil (DX11.RenderState Advanced)
-* Sampler (DX11 Advanced)
-* RenderSemantic (DX11 RWStructuredBuffer)
-* DynamicTexture (DX11.Texture 1d)
-* AsRaw (DX11.Texture 2d)
-* FrameDelay (DX11.Texture 2d)
-* Info (DX11.Texture 2d)
-* StencilView (DX11.Texture 2d)
-* Info (DX11.Texture 3d)
-* Frustrum (Transform)
-* GetMultiSlice (DX11.Validator)
-* GetSpread (DX11.Validator)
-* ViewPort (DX11)
-* FromSharedTexture (DX11.Texture 2d)
-* AsSharedTexture (DX11.Texture 2d)
-* Unzip (TextStyle)
-* Unzip (TextStyle Bin)
-* DispatchIndirect (DX11.Drawer Buffer)
-* DispatchIndirect (DX11.Drawer 1D)
-* InputElement (DX11.Geometry Join Advanced)
-* InputElement (DX11.Geometry Preset)
-* NullIndirect (DX11.Drawer Buffer)
-* AsGeometry (DX11.Buffer Advanced)
-
-# Kinect 1
-* SmoothSettings (Kinect Microsoft)
-* Gesture (Kinect Microsoft)
-* Interaction (Kinect Microsoft)
-* UserInfo (Kinect Microsoft)
-* RGBDepth (Kinect Microsoft)
-* BackGround (Kinect Microsoft)
-* Player (Kinect Microsoft)
-* Skeleton (DX11.Geometry Lines)
-* Skeleton (Kinect Microsoft)
-
-# Bullet
-* DynamicBuffer (DX11 Bullet.RigidBody)
-* GetSoftBodyBuffer (Bullet)
-* SoftBody (Bullet DX11.Geometry)
-* DestroyBody (Bullet)
-* AppendAnchor (Bullet)
-* ApplyForce (Bullet)
-* ApplyImpulse (Bullet)
-* ApplyTorque (Bullet)
-* UpdateBody (Bullet Rigid)
-* ApplyForce (Bullet SoftBody)
-* SetMass (Bullet SoftBody)
-* UpdateSoftBodyConfig (Bullet)
-* GetBoundingSphere (Bullet)
-* CreateRigidBody (Bullet)
-* GetRigidBodyDetails (Bullet)
-* CreateRigidBody (Bullet Persist)
-* CreateSoftBody (Bullet)
-* GetSoftBodyDetails (Bullet)
-* DestroyConstraint (Bullet)
-* Hinge (Bullet Constraint.Single)
-* Point2Point (Bullet Constraint.Single)
-* GetContactDetails (Bullet)
-* GetContactPointDetails (Bullet)
-* CompoundShape (Bullet Group)
-* CompoundShape (Bullet Spread)
-* Box (Bullet)
-* ConvexHull (Bullet)
-* Cylinder (Bullet)
-* HeightField (Bullet)
-* Sphere (Bullet)
-* ConvexHull (Bullet SoftShape)
-* Ellipsoid (Bullet)
-* Patch (Bullet)
-* Rope (Bullet)
-* TetGen (Bullet SoftShape)
-* TriMesh (Bullet SoftShape)
-* GetRigidShapeDetails (Bullet)
-* RayCast (Bullet Filtered)
-* RayCast (Bullet)
-* RayCast (Bullet SoftBody)
-* SoftWorld (Bullet)
-* WheelInfo (Bullet Vehicle)
-* Bvh (Bullet Assimp)
-* Bvh (Bullet)
-* CreateVehicle (Bullet)
-* Steer (Bullet Vehicle)
-* Brake (Bullet Vehicle)
-* EngineForce (Bullet Vehicle)
-* ApplyForce (Bullet Node)
 
 
 
diff --git a/Nodes/VVVV.DX11.Nodes.Assimp/VVVV.DX11.Nodes.Assimp.csproj b/Nodes/VVVV.DX11.Nodes.Assimp/VVVV.DX11.Nodes.Assimp.csproj
@@ -67,10 +67,7 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="AfterBuild">
-    <Copy SourceFiles="$(SolutionDir)\Dependencies\x86\Assimp32.dll" DestinationFolder="$(OutputPath)" Condition="'$(Platform)' == 'x86'" />
-    <Copy SourceFiles="$(SolutionDir)\Dependencies\x64\Assimp64.dll" DestinationFolder="$(OutputPath)" Condition="'$(Platform)' == 'x64'" />
-  </Target>
+
   <!-- 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">

diff --git a/deploy.targets b/deploy.targets
@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8"?><Project    xmlns="http://schemas.microsoft.com/developer/msbuild/2003"    ToolsVersion="4.0"    DefaultTargets="Build">  <ItemGroup>    <DeployFolder Include="Deploy\**\*.*" />  </ItemGroup>  <ItemGroup>    <GirlPower Include="girlpower\girlpower\**\*.*" />  </ItemGroup>    <ItemGroup>    <NuiDatabase Include="$(KINECTSDK20_DIR)Redist\Face\x64\NuiDatabase\**\*.*" />  </ItemGroup>    <ItemGroup>    <vgbtechs Include="$(KINECTSDK20_DIR)Redist\VGB\x64\vgbtechs\**\*.*" />  </ItemGroup>  <ItemGroup>    <GirlPowerNodes Include="girlpower\nodes\**\*.*" />  </ItemGroup>  <Target Name="Clean-Deploy">    <Delete Files="@(DeployFolder)" />  </Target>  <Target Name="Build-x86">    <MSBuild Projects="vvvv-dx11.sln" Properties="Configuration=Release;Platform=x86;DebugSymbols=false;DebugType=None" />  </Target>  <Target Name="Build-x64">    <MSBuild Projects="vvvv-dx11.sln" Properties="Configuration=Release;Platform=x64;DebugSymbols=false;DebugType=None" />  </Target>  <Target Name="Build">    <Delete Files="Deploy\**\*.*" />        <CallTarget Targets="Build-x86" />	<Exec WorkingDirectory="Deploy\Release\x86\packs\DX11\nodes\plugins\vlc\" Command="..\..\..\..\..\..\..\..\Tools\7zA.exe x ..\..\..\..\..\..\..\..\Dependencies\x86\vlc-plugins.zip" LogStandardErrorAsError="true" />    <Copy SourceFiles="@(GirlPowerNodes)" DestinationFolder="Deploy\Release\x86\packs\dx11\nodes\%(GirlPowerNodes.RecursiveDir)" />    <Copy SourceFiles="@(GirlPower)" DestinationFolder="Deploy\Release\x86\packs\dx11\girlpower\%(GirlPower.RecursiveDir)" />    <Exec WorkingDirectory="Deploy\Release\x86\" Command="..\..\..\Tools\7zA.exe a -tzip ..\..\..\Zip\vvvv-packs-dx11-x86.zip packs" LogStandardErrorAsError="true" />	<Exec WorkingDirectory="Deploy\Release\x86\packs\dx11\core\" Command="..\..\..\..\..\..\Tools\7zA.exe a -tzip ..\..\..\..\..\..\Zip\vvvv-dx11-core-x86.zip -x!VVVV.DX11.Lib.dll" LogStandardErrorAsError="true" />    <CallTarget Targets="Build-x64" />	<Exec WorkingDirectory="Deploy\Release\x64\packs\DX11\nodes\plugins\vlc\" Command="..\..\..\..\..\..\..\..\Tools\7zA.exe x ..\..\..\..\..\..\..\..\Dependencies\x64\vlc-plugins.zip" LogStandardErrorAsError="true" />    <Copy SourceFiles="@(GirlPowerNodes)" DestinationFolder="Deploy\Release\x64\packs\dx11\nodes\%(GirlPowerNodes.RecursiveDir)" />    <Copy SourceFiles="@(GirlPower)" DestinationFolder="Deploy\Release\x64\packs\dx11\girlpower\%(GirlPower.RecursiveDir)" />	<Copy SourceFiles="@(NuiDatabase)" DestinationFolder="Deploy\Release\x64\packs\dx11\nodes\plugins\kinect2\NuiDatabase\%(NuiDatabase.RecursiveDir)" />    <Copy SourceFiles="@(vgbtechs)" DestinationFolder="Deploy\Release\x64\packs\dx11\nodes\plugins\kinect2\vgbtechs\%(vgbtechs.RecursiveDir)" />    <Exec WorkingDirectory="Deploy\Release\x64\" Command="..\..\..\Tools\7zA.exe a -tzip ..\..\..\Zip\vvvv-packs-dx11-x64.zip packs" LogStandardErrorAsError="true" />	<Exec WorkingDirectory="Deploy\Release\x64\packs\dx11\core\" Command="..\..\..\Tools\7zA.exe a -tzip ..\..\..\Zip\vvvv-dx11-core-x64.zip packs" LogStandardErrorAsError="true" />	<Exec WorkingDirectory="Deploy\Release\x64\packs\dx11\core\" Command="..\..\..\..\..\..\Tools\7zA.exe a -tzip ..\..\..\..\..\..\Zip\vvvv-dx11-core-x64.zip -x!VVVV.DX11.Lib.dll" LogStandardErrorAsError="true" />  </Target></Project>
+<?xml version="1.0" encoding="utf-8"?><Project    xmlns="http://schemas.microsoft.com/developer/msbuild/2003"    ToolsVersion="4.0"    DefaultTargets="Build">  <ItemGroup>    <DeployFolder Include="Deploy\**\*.*" />  </ItemGroup>  <ItemGroup>    <GirlPower Include="girlpower\girlpower\**\*.*" />  </ItemGroup>    <ItemGroup>    <NuiDatabase Include="$(KINECTSDK20_DIR)Redist\Face\x64\NuiDatabase\**\*.*" />  </ItemGroup>    <ItemGroup>    <vgbtechs Include="$(KINECTSDK20_DIR)Redist\VGB\x64\vgbtechs\**\*.*" />  </ItemGroup>  <ItemGroup>    <GirlPowerNodes Include="girlpower\nodes\**\*.*" />  </ItemGroup>  <Target Name="Clean-Deploy">    <Delete Files="@(DeployFolder)" />  </Target>  <Target Name="Build-x86">    <MSBuild Projects="vvvv-dx11.sln" Properties="Configuration=Release;Platform=x86;DebugSymbols=false;DebugType=None" />  </Target>  <Target Name="Build-x64">    <MSBuild Projects="vvvv-dx11.sln" Properties="Configuration=Release;Platform=x64;DebugSymbols=false;DebugType=None" />  </Target>  <Target Name="Build">    <Delete Files="Deploy\**\*.*" />        <CallTarget Targets="Build-x86" />	<Exec WorkingDirectory="Deploy\Release\x86\packs\DX11\nodes\plugins\vlc\" Command="..\..\..\..\..\..\..\..\Tools\7zA.exe x ..\..\..\..\..\..\..\..\Dependencies\x86\vlc-plugins.zip" LogStandardErrorAsError="true" />    <Copy SourceFiles="@(GirlPowerNodes)" DestinationFolder="Deploy\Release\x86\packs\dx11\nodes\%(GirlPowerNodes.RecursiveDir)" />    <Copy SourceFiles="@(GirlPower)" DestinationFolder="Deploy\Release\x86\packs\dx11\girlpower\%(GirlPower.RecursiveDir)" />    <Exec WorkingDirectory="Deploy\Release\x86\" Command="..\..\..\Tools\7zA.exe a -tzip ..\..\..\Zip\vvvv-packs-dx11-x86.zip packs" LogStandardErrorAsError="true" />	<Exec WorkingDirectory="Deploy\Release\x86\packs\dx11\core\" Command="..\..\..\..\..\..\Tools\7zA.exe a -tzip ..\..\..\..\..\..\Zip\vvvv-dx11-core-x86.zip -x!VVVV.DX11.Lib.dll" LogStandardErrorAsError="true" />    <CallTarget Targets="Build-x64" />	<Exec WorkingDirectory="Deploy\Release\x64\packs\DX11\nodes\plugins\vlc\" Command="..\..\..\..\..\..\..\..\Tools\7zA.exe x ..\..\..\..\..\..\..\..\Dependencies\x64\vlc-plugins.zip" LogStandardErrorAsError="true" />    <Copy SourceFiles="@(GirlPowerNodes)" DestinationFolder="Deploy\Release\x64\packs\dx11\nodes\%(GirlPowerNodes.RecursiveDir)" />    <Copy SourceFiles="@(GirlPower)" DestinationFolder="Deploy\Release\x64\packs\dx11\girlpower\%(GirlPower.RecursiveDir)" />	<Copy SourceFiles="@(NuiDatabase)" DestinationFolder="Deploy\Release\x64\packs\dx11\nodes\plugins\kinect2\NuiDatabase\%(NuiDatabase.RecursiveDir)" />    <Copy SourceFiles="@(vgbtechs)" DestinationFolder="Deploy\Release\x64\packs\dx11\nodes\plugins\kinect2\vgbtechs\%(vgbtechs.RecursiveDir)" />    <Exec WorkingDirectory="Deploy\Release\x64\" Command="..\..\..\Tools\7zA.exe a -tzip ..\..\..\Zip\vvvv-packs-dx11-x64.zip packs" LogStandardErrorAsError="true" />	<Exec WorkingDirectory="Deploy\Release\x64\packs\dx11\core\" Command="..\..\..\..\..\..\Tools\7zA.exe a -tzip ..\..\..\..\..\..\Zip\vvvv-dx11-core-x64.zip -x!VVVV.DX11.Lib.dll" LogStandardErrorAsError="true" />  </Target></Project>