Commit dbdad0a0 authored by Chuck Walbourn's avatar Chuck Walbourn
Browse files

Updated for DirectX Tool Kit July 2017 releases

parent b9630e14

.gitignore

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ Debug 
Profile

Release

x64

Kits/DirectXTK/Src/Shaders/Compiled/XboxOne*.*

Kits/DirectXTK12/Src/Shaders/Compiled/XboxOne*.*

Samples/Graphics/SimplePBR12/Compiled/

Samples/Tools/errorlookup/errorlookup/project.lock.json

/wiki

Kits/DirectXTK/Audio/AudioEngine.cpp

+0 −2
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ using Microsoft::WRL::ComPtr; 


//#define VERBOSE_TRACE



#pragma warning(disable : 4351)



namespace

{

    struct EngineCallback : public IXAudio2EngineCallback

Kits/DirectXTK/Audio/DirectXTKAudio_Desktop_2015_Win8.vcxproj

0 → 100644
+185 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

  <ItemGroup Label="ProjectConfigurations">

    <ProjectConfiguration Include="Debug|Win32">

      <Configuration>Debug</Configuration>

      <Platform>Win32</Platform>

    </ProjectConfiguration>

    <ProjectConfiguration Include="Debug|x64">

      <Configuration>Debug</Configuration>

      <Platform>x64</Platform>

    </ProjectConfiguration>

    <ProjectConfiguration Include="Release|Win32">

      <Configuration>Release</Configuration>

      <Platform>Win32</Platform>

    </ProjectConfiguration>

    <ProjectConfiguration Include="Release|x64">

      <Configuration>Release</Configuration>

      <Platform>x64</Platform>

    </ProjectConfiguration>

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\Inc\Audio.h" />

    <ClInclude Include="SoundCommon.h" />

    <ClInclude Include="WaveBankReader.h" />

    <ClInclude Include="WAVFileReader.h" />

  </ItemGroup>

  <ItemGroup>

    <ClCompile Include="AudioEngine.cpp">

      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>

      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>

      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>

      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>

    </ClCompile>

    <ClCompile Include="DynamicSoundEffectInstance.cpp" />

    <ClCompile Include="SoundCommon.cpp" />

    <ClCompile Include="SoundEffect.cpp" />

    <ClCompile Include="SoundEffectInstance.cpp" />

    <ClCompile Include="WaveBank.cpp" />

    <ClCompile Include="WaveBankReader.cpp" />

    <ClCompile Include="WAVFileReader.cpp" />

  </ItemGroup>

  <PropertyGroup Label="Globals">

    <ProjectGuid>{4F150A30-CECB-49D1-8283-6A3F57438CF5}</ProjectGuid>

    <Keyword>Win32Proj</Keyword>

    <RootNamespace>DirectXTKAudio</RootNamespace>

  </PropertyGroup>

  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

    <ConfigurationType>StaticLibrary</ConfigurationType>

    <UseDebugLibraries>true</UseDebugLibraries>

    <PlatformToolset>v140</PlatformToolset>

    <CharacterSet>Unicode</CharacterSet>

  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

    <ConfigurationType>StaticLibrary</ConfigurationType>

    <UseDebugLibraries>true</UseDebugLibraries>

    <PlatformToolset>v140</PlatformToolset>

    <CharacterSet>Unicode</CharacterSet>

  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

    <ConfigurationType>StaticLibrary</ConfigurationType>

    <UseDebugLibraries>false</UseDebugLibraries>

    <PlatformToolset>v140</PlatformToolset>

    <CharacterSet>Unicode</CharacterSet>

  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

    <ConfigurationType>StaticLibrary</ConfigurationType>

    <UseDebugLibraries>false</UseDebugLibraries>

    <PlatformToolset>v140</PlatformToolset>

    <CharacterSet>Unicode</CharacterSet>

  </PropertyGroup>

  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

  <ImportGroup Label="ExtensionSettings">

  </ImportGroup>

  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

  </ImportGroup>

  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

  </ImportGroup>

  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

  </ImportGroup>

  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

  </ImportGroup>

  <PropertyGroup Label="UserMacros" />

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

    <OutDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</OutDir>

    <IntDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</IntDir>

    <TargetName>DirectXTKAudioWin8</TargetName>

  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

    <OutDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</OutDir>

    <IntDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</IntDir>

    <TargetName>DirectXTKAudioWin8</TargetName>

  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

    <OutDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</OutDir>

    <IntDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</IntDir>

    <TargetName>DirectXTKAudioWin8</TargetName>

  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

    <OutDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</OutDir>

    <IntDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</IntDir>

    <TargetName>DirectXTKAudioWin8</TargetName>

  </PropertyGroup>

  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

    <ClCompile>

      <PrecompiledHeader>Use</PrecompiledHeader>

      <WarningLevel>EnableAllWarnings</WarningLevel>

      <Optimization>Disabled</Optimization>

      <PreprocessorDefinitions>_WIN32_WINNT=0x0602;WIN32;_DEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <AdditionalIncludeDirectories>..\Inc;..\Src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>

      <FloatingPointModel>Fast</FloatingPointModel>

      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>

      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>

    </ClCompile>

    <Link>

      <SubSystem>Windows</SubSystem>

      <GenerateDebugInformation>true</GenerateDebugInformation>

    </Link>

  </ItemDefinitionGroup>

  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

    <ClCompile>

      <PrecompiledHeader>Use</PrecompiledHeader>

      <WarningLevel>EnableAllWarnings</WarningLevel>

      <Optimization>Disabled</Optimization>

      <PreprocessorDefinitions>_WIN32_WINNT=0x0602;WIN32;_DEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <AdditionalIncludeDirectories>..\Inc;..\Src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <FloatingPointModel>Fast</FloatingPointModel>

      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>

      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>

    </ClCompile>

    <Link>

      <SubSystem>Windows</SubSystem>

      <GenerateDebugInformation>true</GenerateDebugInformation>

    </Link>

  </ItemDefinitionGroup>

  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

    <ClCompile>

      <WarningLevel>EnableAllWarnings</WarningLevel>

      <PrecompiledHeader>Use</PrecompiledHeader>

      <Optimization>MaxSpeed</Optimization>

      <FunctionLevelLinking>true</FunctionLevelLinking>

      <IntrinsicFunctions>true</IntrinsicFunctions>

      <PreprocessorDefinitions>_WIN32_WINNT=0x0602;WIN32;NDEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <AdditionalIncludeDirectories>..\Inc;..\Src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>

      <FloatingPointModel>Fast</FloatingPointModel>

      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>

      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>

    </ClCompile>

    <Link>

      <SubSystem>Windows</SubSystem>

      <GenerateDebugInformation>true</GenerateDebugInformation>

      <EnableCOMDATFolding>true</EnableCOMDATFolding>

      <OptimizeReferences>true</OptimizeReferences>

    </Link>

  </ItemDefinitionGroup>

  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

    <ClCompile>

      <WarningLevel>EnableAllWarnings</WarningLevel>

      <PrecompiledHeader>Use</PrecompiledHeader>

      <Optimization>MaxSpeed</Optimization>

      <FunctionLevelLinking>true</FunctionLevelLinking>

      <IntrinsicFunctions>true</IntrinsicFunctions>

      <PreprocessorDefinitions>_WIN32_WINNT=0x0602;WIN32;NDEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <AdditionalIncludeDirectories>..\Inc;..\Src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <FloatingPointModel>Fast</FloatingPointModel>

      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>

      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>

    </ClCompile>

    <Link>

      <SubSystem>Windows</SubSystem>

      <GenerateDebugInformation>true</GenerateDebugInformation>

      <EnableCOMDATFolding>true</EnableCOMDATFolding>

      <OptimizeReferences>true</OptimizeReferences>

    </Link>

  </ItemDefinitionGroup>

  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

  <ImportGroup Label="ExtensionTargets">

  </ImportGroup>

</Project>
 
 No newline at end of file

Kits/DirectXTK/Audio/DirectXTKAudio_Desktop_2015_Win8.vcxproj.filters

0 → 100644
+53 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

  <ItemGroup>

    <Filter Include="Inc">

      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>

      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>

    </Filter>

    <Filter Include="Src">

      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>

      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>

    </Filter>

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="WaveBankReader.h">

      <Filter>Inc</Filter>

    </ClInclude>

    <ClInclude Include="WAVFileReader.h">

      <Filter>Inc</Filter>

    </ClInclude>

    <ClInclude Include="..\Inc\Audio.h">

      <Filter>Inc</Filter>

    </ClInclude>

    <ClInclude Include="SoundCommon.h">

      <Filter>Inc</Filter>

    </ClInclude>

  </ItemGroup>

  <ItemGroup>

    <ClCompile Include="AudioEngine.cpp">

      <Filter>Src</Filter>

    </ClCompile>

    <ClCompile Include="WaveBankReader.cpp">

      <Filter>Src</Filter>

    </ClCompile>

    <ClCompile Include="WAVFileReader.cpp">

      <Filter>Src</Filter>

    </ClCompile>

    <ClCompile Include="SoundEffect.cpp">

      <Filter>Src</Filter>

    </ClCompile>

    <ClCompile Include="WaveBank.cpp">

      <Filter>Src</Filter>

    </ClCompile>

    <ClCompile Include="SoundEffectInstance.cpp">

      <Filter>Src</Filter>

    </ClCompile>

    <ClCompile Include="SoundCommon.cpp">

      <Filter>Src</Filter>

    </ClCompile>

    <ClCompile Include="DynamicSoundEffectInstance.cpp">

      <Filter>Src</Filter>

    </ClCompile>

  </ItemGroup>

</Project>
 
 No newline at end of file

Kits/DirectXTK/Audio/SoundCommon.cpp

+0 −2
Original line number Diff line number Diff line
@@ -11,8 +11,6 @@ 
// http://go.microsoft.com/fwlink/?LinkId=248929

//--------------------------------------------------------------------------------------



#pragma once



#include "pch.h"

#include "SoundCommon.h"