Fixing issues with DirectX and includes.

Removed d3dx12 as its not usable with the CINTERFACE define.

Juliet/Juliet.vcxproj

@@ -44,14 +44,14 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)\lib\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir>$(SolutionDir)\bin\$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)Intermediate\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-    <IncludePath>$(SolutionDir)Juliet\include\;$(SolutionDir)Juliet\src\;$(SolutionDir)Juliet\src\Graphics\DX12\D3D12;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)Juliet\include\;$(SolutionDir)Juliet\src\;$(SolutionDir)Juliet\src\Graphics\D3D12\;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <OutDir>$(SolutionDir)\bin\$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)Intermediate\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-    <IncludePath>$(SolutionDir)Juliet\include\;$(SolutionDir)Juliet\src\;$(SolutionDir)Juliet\src\Graphics\DX12\D3D12;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)Juliet\include\;$(SolutionDir)Juliet\src\;$(SolutionDir)Juliet\src\Graphics\D3D12\;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
@@ -70,7 +70,7 @@
       <SubSystem>
       </SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>ws2_32.lib;d3d12.lib;dxgi.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;dxguid.lib;d3d12.lib;dxgi.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <Lib>
       <AdditionalDependencies>
@@ -98,7 +98,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>ws2_32.lib;d3d12.lib;dxgi.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;dxguid.lib;d3d12.lib;dxgi.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -148,44 +148,8 @@
     <ClInclude Include="src\Core\HAL\Event\WindowEvent.h" />
     <ClInclude Include="src\Core\Networking\SocketPlatformImpl.h" />
     <ClInclude Include="src\Core\HAL\Win32.h" />
-    <ClInclude Include="src\Graphics\DX12\D3D12\directx\d3d12.h" />
-    <ClInclude Include="src\Graphics\DX12\D3D12\directx\d3d12compatibility.h" />
-    <ClInclude Include="src\Graphics\DX12\D3D12\directx\d3d12sdklayers.h" />
-    <ClInclude Include="src\Graphics\DX12\D3D12\directx\d3d12shader.h" />
-    <ClInclude Include="src\Graphics\DX12\D3D12\directx\D3D12TokenizedProgramFormat.hpp" />
-    <ClInclude Include="src\Graphics\DX12\D3D12\directx\d3d12video.h" />
-    <ClInclude Include="src\Graphics\DX12\D3D12\directx\d3dcommon.h" />
-    <ClInclude Include="src\Graphics\DX12\D3D12\directx\d3dx12.h" />
-    <ClInclude Include="src\Graphics\DX12\D3D12\directx\d3dx12_barriers.h" />
-    <ClInclude Include="src\Graphics\DX12\D3D12\directx\d3dx12_check_feature_support.h" />
-    <ClInclude Include="src\Graphics\DX12\D3D12\directx\d3dx12_core.h" />
-    <ClInclude Include="src\Graphics\DX12\D3D12\directx\d3dx12_default.h" />
-    <ClInclude Include="src\Graphics\DX12\D3D12\directx\d3dx12_pipeline_state_stream.h" />
-    <ClInclude Include="src\Graphics\DX12\D3D12\directx\d3dx12_property_format_table.h" />
-    <ClInclude Include="src\Graphics\DX12\D3D12\directx\d3dx12_render_pass.h" />
-    <ClInclude Include="src\Graphics\DX12\D3D12\directx\d3dx12_resource_helpers.h" />
-    <ClInclude Include="src\Graphics\DX12\D3D12\directx\d3dx12_root_signature.h" />
-    <ClInclude Include="src\Graphics\DX12\D3D12\directx\d3dx12_state_object.h" />
-    <ClInclude Include="src\Graphics\DX12\D3D12\directx\DirectML.h" />
-    <ClInclude Include="src\Graphics\DX12\D3D12\directx\dxcore.h" />
-    <ClInclude Include="src\Graphics\DX12\D3D12\directx\dxcore_interface.h" />
-    <ClInclude Include="src\Graphics\DX12\D3D12\directx\dxgicommon.h" />
-    <ClInclude Include="src\Graphics\DX12\D3D12\directx\dxgiformat.h" />
-    <ClInclude Include="src\Graphics\DX12\D3D12\dxguids\dxguids.h" />
-    <ClInclude Include="src\Graphics\DX12\D3D12\wsl\stubs\basetsd.h" />
-    <ClInclude Include="src\Graphics\DX12\D3D12\wsl\stubs\oaidl.h" />
-    <ClInclude Include="src\Graphics\DX12\D3D12\wsl\stubs\ocidl.h" />
-    <ClInclude Include="src\Graphics\DX12\D3D12\wsl\stubs\rpc.h" />
-    <ClInclude Include="src\Graphics\DX12\D3D12\wsl\stubs\rpcndr.h" />
-    <ClInclude Include="src\Graphics\DX12\D3D12\wsl\stubs\unknwn.h" />
-    <ClInclude Include="src\Graphics\DX12\D3D12\wsl\stubs\unknwnbase.h" />
-    <ClInclude Include="src\Graphics\DX12\D3D12\wsl\stubs\winapifamily.h" />
-    <ClInclude Include="src\Graphics\DX12\D3D12\wsl\stubs\wrl\client.h" />
-    <ClInclude Include="src\Graphics\DX12\D3D12\wsl\stubs\wrl\implements.h" />
-    <ClInclude Include="src\Graphics\DX12\D3D12\wsl\winadapter.h" />
-    <ClInclude Include="src\Graphics\DX12\D3D12\wsl\wrladapter.h" />
-    <ClInclude Include="src\Graphics\DX12\DX12Includes.h" />
-    <ClInclude Include="src\Graphics\DX12\DX12Utils.h" />
+    <ClInclude Include="src\Graphics\D3D12\DX12Includes.h" />
+    <ClInclude Include="src\Graphics\D3D12\DX12Utils.h" />
     <ClInclude Include="src\Graphics\GraphicsDevice.h" />
   </ItemGroup>
   <ItemGroup>
@@ -209,9 +173,7 @@
     <ClCompile Include="src\Core\Networking\TcpSocket.cpp" />
     <ClCompile Include="src\Core\Networking\Win32\Win32SocketPlatformImpl.cpp" />
     <ClCompile Include="src\Engine\Engine.cpp" />
-    <ClCompile Include="src\Graphics\DX12\D3D12\directx\d3dx12_property_format_table.cpp" />
-    <ClCompile Include="src\Graphics\DX12\D3D12\dxguids\dxguids.cpp" />
-    <ClCompile Include="src\Graphics\DX12\DX12GraphicsDevice.cpp" />
+    <ClCompile Include="src\Graphics\D3D12\DX12GraphicsDevice.cpp" />
     <ClCompile Include="src\Graphics\Graphics.cpp">
       <RuntimeLibrary>MultiThreadedDebugDll</RuntimeLibrary>
       <Optimization>Disabled</Optimization>
@@ -273,13 +235,6 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="include\Core\Thread\Mutex.h" />
-    <Content Include="src\Graphics\DX12\D3D12\directx\d3d12.idl" />
-    <Content Include="src\Graphics\DX12\D3D12\directx\d3d12compatibility.idl" />
-    <Content Include="src\Graphics\DX12\D3D12\directx\d3d12sdklayers.idl" />
-    <Content Include="src\Graphics\DX12\D3D12\directx\d3d12video.idl" />
-    <Content Include="src\Graphics\DX12\D3D12\directx\d3dcommon.idl" />
-    <Content Include="src\Graphics\DX12\D3D12\directx\dxgicommon.idl" />
-    <Content Include="src\Graphics\DX12\D3D12\directx\dxgiformat.idl" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">