PhysX 3.4, APEX 1.4 patch release @23576764

27 files changed, 8055 insertions, 7570 deletions

diff --git a/PxShared/src/compiler/vc12win32/PsFastXml.vcxproj b/PxShared/src/compiler/vc12win32/PsFastXml.vcxproj
index 2de5e44e..83ea92ae 100644
--- a/PxShared/src/compiler/vc12win32/PsFastXml.vcxproj
+++ b/PxShared/src/compiler/vc12win32/PsFastXml.vcxproj
@@ -1,266 +1,238 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project
-    DefaultTargets="Build"
-    ToolsVersion="12.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="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="checked|Win32">
-      <Configuration>checked</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="profile|Win32">
-      <Configuration>profile</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{82276A9F-CCF0-C50C-BB4A-82ACFFE2A93A}</ProjectGuid>
-    <RootNamespace>PsFastXml</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"
-      Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='release|Win32'"
-      Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='checked|Win32'"
-      Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='profile|Win32'"
-      Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-  </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
-      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
-      Label="PropertySheets"
-      Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
-    <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)'=='profile|Win32'">
-    <Import
-        Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
-        Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
-        Label="LocalAppDataPlatform"
-    />
-  </ImportGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <OutDir>./../../../lib/vc12win32\</OutDir>
-    <IntDir>./Win32/PsFastXml/debug\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>$(ProjectName)DEBUG_x86</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../foundation/include;./../../fastxml/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>PX_FOUNDATION_DLL=0;WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;_DEBUG;PX_DEBUG=1;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName)DEBUG_x86.lib</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Lib>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <OutDir>./../../../lib/vc12win32\</OutDir>
-    <IntDir>./Win32/PsFastXml/release\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>$(ProjectName)_x86</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../foundation/include;./../../fastxml/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>PX_FOUNDATION_DLL=0;WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName)_x86.lib</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Lib>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
-    <OutDir>./../../../lib/vc12win32\</OutDir>
-    <IntDir>./Win32/PsFastXml/checked\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>$(ProjectName)CHECKED_x86</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../foundation/include;./../../fastxml/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>PX_FOUNDATION_DLL=0;WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName)CHECKED_x86.lib</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Lib>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'">
-    <OutDir>./../../../lib/vc12win32\</OutDir>
-    <IntDir>./Win32/PsFastXml/profile\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>$(ProjectName)PROFILE_x86</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../foundation/include;./../../fastxml/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>PX_FOUNDATION_DLL=0;WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_PROFILE=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName)PROFILE_x86.lib</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Lib>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\fastxml\include\PsFastXml.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\fastxml\src\PsFastXml.cpp"></ClCompile>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets"></ImportGroup>
+<Project DefaultTargets="Build" ToolsVersion="12.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="release|Win32">
+			<Configuration>release</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="checked|Win32">
+			<Configuration>checked</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="profile|Win32">
+			<Configuration>profile</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+	</ItemGroup>
+	<PropertyGroup Label="Globals">
+		<ProjectGuid>{82276A9F-CCF0-C50C-BB4A-82ACFFE2A93A}</ProjectGuid>
+		<RootNamespace>PsFastXml</RootNamespace>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<PlatformToolset>v120</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<PlatformToolset>v120</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<PlatformToolset>v120</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<PlatformToolset>v120</PlatformToolset>
+	</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 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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
+		<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)'=='profile|Win32'">
+		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+	</ImportGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
+		<OutDir>./../../../lib/vc12win32\</OutDir>
+		<IntDir>./Win32/PsFastXml/debug\</IntDir>
+		<TargetExt>.lib</TargetExt>
+		<TargetName>$(ProjectName)DEBUG_x86</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
+			<Optimization>Disabled</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../foundation/include;./../../fastxml/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>PX_FOUNDATION_DLL=0;WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;_DEBUG;PX_DEBUG=1;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Lib>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)$(ProjectName)DEBUG_x86.lib</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<TargetMachine>MachineX86</TargetMachine>
+		</Lib>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+			<LinkLibraryDependencies>true</LinkLibraryDependencies>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
+		<OutDir>./../../../lib/vc12win32\</OutDir>
+		<IntDir>./Win32/PsFastXml/release\</IntDir>
+		<TargetExt>.lib</TargetExt>
+		<TargetName>$(ProjectName)_x86</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../foundation/include;./../../fastxml/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>PX_FOUNDATION_DLL=0;WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Lib>
+			<AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)$(ProjectName)_x86.lib</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<TargetMachine>MachineX86</TargetMachine>
+		</Lib>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+			<LinkLibraryDependencies>true</LinkLibraryDependencies>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
+		<OutDir>./../../../lib/vc12win32\</OutDir>
+		<IntDir>./Win32/PsFastXml/checked\</IntDir>
+		<TargetExt>.lib</TargetExt>
+		<TargetName>$(ProjectName)CHECKED_x86</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../foundation/include;./../../fastxml/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>PX_FOUNDATION_DLL=0;WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Lib>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)$(ProjectName)CHECKED_x86.lib</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<TargetMachine>MachineX86</TargetMachine>
+		</Lib>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+			<LinkLibraryDependencies>true</LinkLibraryDependencies>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'">
+		<OutDir>./../../../lib/vc12win32\</OutDir>
+		<IntDir>./Win32/PsFastXml/profile\</IntDir>
+		<TargetExt>.lib</TargetExt>
+		<TargetName>$(ProjectName)PROFILE_x86</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../foundation/include;./../../fastxml/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>PX_FOUNDATION_DLL=0;WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_PROFILE=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Lib>
+			<AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)$(ProjectName)PROFILE_x86.lib</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<TargetMachine>MachineX86</TargetMachine>
+		</Lib>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+			<LinkLibraryDependencies>true</LinkLibraryDependencies>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\fastxml\include\PsFastXml.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\fastxml\src\PsFastXml.cpp">
+		</ClCompile>
+	</ItemGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+	<ImportGroup Label="ExtensionTargets"></ImportGroup>
 </Project>
diff --git a/PxShared/src/compiler/vc12win32/PxFoundation.vcxproj b/PxShared/src/compiler/vc12win32/PxFoundation.vcxproj
index e66820e8..f4b310c5 100644
--- a/PxShared/src/compiler/vc12win32/PxFoundation.vcxproj
+++ b/PxShared/src/compiler/vc12win32/PxFoundation.vcxproj
@@ -1,380 +1,452 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project
-    DefaultTargets="Build"
-    ToolsVersion="12.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="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="checked|Win32">
-      <Configuration>checked</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="profile|Win32">
-      <Configuration>profile</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{DF4537B3-3CE9-1581-10B6-A291FE3299C6}</ProjectGuid>
-    <RootNamespace>PxFoundation</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"
-      Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='release|Win32'"
-      Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='checked|Win32'"
-      Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='profile|Win32'"
-      Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-  </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
-      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
-      Label="PropertySheets"
-      Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
-    <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)'=='profile|Win32'">
-    <Import
-        Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
-        Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
-        Label="LocalAppDataPlatform"
-    />
-  </ImportGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <OutDir>./../../../bin/vc12win32\</OutDir>
-    <IntDir>./Win32/PxFoundation/debug\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>PxFoundationDEBUG_x86</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-    <SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;$(WindowsSDK_IncludePath);./../../foundation/include;./../../foundation/include/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>PX_FOUNDATION_DLL=1;WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;_DEBUG;PX_DEBUG=1;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)PxFoundationDEBUG_x86.dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <ImportLibrary>./../../../lib/vc12win32/$(TargetName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference></ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <OutDir>./../../../bin/vc12win32\</OutDir>
-    <IntDir>./Win32/PxFoundation/release\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>PxFoundation_x86</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-    <SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;$(WindowsSDK_IncludePath);./../../foundation/include;./../../foundation/include/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>PX_FOUNDATION_DLL=1;WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)PxFoundation_x86.dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <ImportLibrary>./../../../lib/vc12win32/$(TargetName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference></ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
-    <OutDir>./../../../bin/vc12win32\</OutDir>
-    <IntDir>./Win32/PxFoundation/checked\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>PxFoundationCHECKED_x86</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-    <SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;$(WindowsSDK_IncludePath);./../../foundation/include;./../../foundation/include/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>PX_FOUNDATION_DLL=1;WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)PxFoundationCHECKED_x86.dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <ImportLibrary>./../../../lib/vc12win32/$(TargetName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference></ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'">
-    <OutDir>./../../../bin/vc12win32\</OutDir>
-    <IntDir>./Win32/PxFoundation/profile\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>PxFoundationPROFILE_x86</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-    <SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;$(WindowsSDK_IncludePath);./../../foundation/include;./../../foundation/include/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>PX_FOUNDATION_DLL=1;WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_PROFILE=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)PxFoundationPROFILE_x86.dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <ImportLibrary>./../../../lib/vc12win32/$(TargetName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference></ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\resource_x86\PxFoundation.rc"></ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\include\foundation\windows\PxWindowsFoundationDelayLoadHook.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\windows\PxWindowsIntrinsics.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\include\foundation\Px.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxAllocatorCallback.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxAssert.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxBitAndData.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxBounds3.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxErrorCallback.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxErrors.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxFlags.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxFoundation.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxFoundationVersion.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxIntrinsics.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxIO.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxMat33.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxMat44.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxMath.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxMathUtils.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxMemory.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxPlane.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxPreprocessor.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxProfiler.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxQuat.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxSimpleTypes.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxStrideIterator.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxTransform.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxUnionCast.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxVec2.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxVec3.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxVec4.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\foundation\include\windows\PsWindowsAoS.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\windows\PsWindowsFPU.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\windows\PsWindowsInclude.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\windows\PsWindowsInlineAoS.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\windows\PsWindowsIntrinsics.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\windows\PsWindowsLoadLibrary.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\windows\PsWindowsTrigConstants.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\foundation\include\Ps.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsAlignedMalloc.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsAlloca.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsAllocator.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsAoS.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsArray.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsAtomic.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsBasicTemplates.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsBitUtils.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsBroadcast.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsCpu.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsFoundation.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsFPU.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsHash.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsHashInternals.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsHashMap.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsHashSet.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsInlineAllocator.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsInlineAoS.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsInlineArray.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsIntrinsics.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsMathUtils.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsMutex.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsPool.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsSList.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsSocket.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsSort.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsSortInternals.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsString.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsSync.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsTempAllocator.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsThread.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsTime.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsUserAllocated.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsUtilities.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsVecMath.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsVecMathAoSScalar.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsVecMathAoSScalarInline.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsVecMathSSE.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsVecMathUtilities.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsVecQuat.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsVecTransform.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsAtomic.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsCpu.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsFPU.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsMutex.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsPrintString.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsSList.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsSocket.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsSync.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsThread.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsTime.cpp"></ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\foundation\src\PsAllocator.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\PsAssert.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\PsFoundation.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\PsMathUtils.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\PsString.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\PsTempAllocator.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\PsUtilities.cpp"></ClCompile>
-  </ItemGroup>
-  <ItemGroup></ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets"></ImportGroup>
+<Project DefaultTargets="Build" ToolsVersion="12.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="release|Win32">
+			<Configuration>release</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="checked|Win32">
+			<Configuration>checked</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="profile|Win32">
+			<Configuration>profile</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+	</ItemGroup>
+	<PropertyGroup Label="Globals">
+		<ProjectGuid>{DF4537B3-3CE9-1581-10B6-A291FE3299C6}</ProjectGuid>
+		<RootNamespace>PxFoundation</RootNamespace>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
+		<ConfigurationType>DynamicLibrary</ConfigurationType>
+		<PlatformToolset>v120</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
+		<ConfigurationType>DynamicLibrary</ConfigurationType>
+		<PlatformToolset>v120</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'" Label="Configuration">
+		<ConfigurationType>DynamicLibrary</ConfigurationType>
+		<PlatformToolset>v120</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'" Label="Configuration">
+		<ConfigurationType>DynamicLibrary</ConfigurationType>
+		<PlatformToolset>v120</PlatformToolset>
+	</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 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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
+		<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)'=='profile|Win32'">
+		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+	</ImportGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
+		<OutDir>./../../../bin/vc12win32\</OutDir>
+		<IntDir>./Win32/PxFoundation/debug\</IntDir>
+		<TargetExt>.dll</TargetExt>
+		<TargetName>PxFoundationDEBUG_x86</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+		<SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
+			<Optimization>Disabled</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;$(WindowsSDK_IncludePath);./../../foundation/include;./../../foundation/include/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>PX_FOUNDATION_DLL=1;WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;_DEBUG;PX_DEBUG=1;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Link>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)PxFoundationDEBUG_x86.dll</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<SubSystem>Console</SubSystem>
+			<ImportLibrary>./../../../lib/vc12win32/$(TargetName).lib</ImportLibrary>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<TargetMachine>MachineX86</TargetMachine>
+		</Link>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
+		<OutDir>./../../../bin/vc12win32\</OutDir>
+		<IntDir>./Win32/PxFoundation/release\</IntDir>
+		<TargetExt>.dll</TargetExt>
+		<TargetName>PxFoundation_x86</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+		<SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;$(WindowsSDK_IncludePath);./../../foundation/include;./../../foundation/include/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>PX_FOUNDATION_DLL=1;WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Link>
+			<AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)PxFoundation_x86.dll</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<SubSystem>Console</SubSystem>
+			<ImportLibrary>./../../../lib/vc12win32/$(TargetName).lib</ImportLibrary>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<TargetMachine>MachineX86</TargetMachine>
+		</Link>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
+		<OutDir>./../../../bin/vc12win32\</OutDir>
+		<IntDir>./Win32/PxFoundation/checked\</IntDir>
+		<TargetExt>.dll</TargetExt>
+		<TargetName>PxFoundationCHECKED_x86</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+		<SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;$(WindowsSDK_IncludePath);./../../foundation/include;./../../foundation/include/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>PX_FOUNDATION_DLL=1;WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Link>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)PxFoundationCHECKED_x86.dll</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<SubSystem>Console</SubSystem>
+			<ImportLibrary>./../../../lib/vc12win32/$(TargetName).lib</ImportLibrary>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<TargetMachine>MachineX86</TargetMachine>
+		</Link>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'">
+		<OutDir>./../../../bin/vc12win32\</OutDir>
+		<IntDir>./Win32/PxFoundation/profile\</IntDir>
+		<TargetExt>.dll</TargetExt>
+		<TargetName>PxFoundationPROFILE_x86</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+		<SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;$(WindowsSDK_IncludePath);./../../foundation/include;./../../foundation/include/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>PX_FOUNDATION_DLL=1;WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_PROFILE=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Link>
+			<AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)PxFoundationPROFILE_x86.dll</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<SubSystem>Console</SubSystem>
+			<ImportLibrary>./../../../lib/vc12win32/$(TargetName).lib</ImportLibrary>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<TargetMachine>MachineX86</TargetMachine>
+		</Link>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<ItemGroup>
+		<ResourceCompile Include="..\resource_x86\PxFoundation.rc">
+		</ResourceCompile>
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\..\include\foundation\windows\PxWindowsFoundationDelayLoadHook.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\windows\PxWindowsIntrinsics.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\..\include\foundation\Px.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxAllocatorCallback.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxAssert.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxBitAndData.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxBounds3.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxErrorCallback.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxErrors.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxFlags.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxFoundation.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxFoundationVersion.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxIntrinsics.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxIO.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxMat33.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxMat44.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxMath.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxMathUtils.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxMemory.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxPlane.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxPreprocessor.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxProfiler.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxQuat.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxSimpleTypes.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxStrideIterator.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxTransform.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxUnionCast.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxVec2.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxVec3.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxVec4.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\foundation\include\windows\PsWindowsAoS.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\windows\PsWindowsFPU.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\windows\PsWindowsInclude.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\windows\PsWindowsInlineAoS.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\windows\PsWindowsIntrinsics.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\windows\PsWindowsLoadLibrary.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\windows\PsWindowsTrigConstants.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\foundation\include\Ps.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsAlignedMalloc.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsAlloca.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsAllocator.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsAoS.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsArray.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsAtomic.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsBasicTemplates.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsBitUtils.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsBroadcast.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsCpu.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsFoundation.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsFPU.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsHash.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsHashInternals.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsHashMap.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsHashSet.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsInlineAllocator.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsInlineAoS.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsInlineArray.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsIntrinsics.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsMathUtils.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsMutex.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsPool.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsSList.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsSocket.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsSort.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsSortInternals.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsString.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsSync.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsTempAllocator.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsThread.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsTime.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsUserAllocated.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsUtilities.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsVecMath.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsVecMathAoSScalar.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsVecMathAoSScalarInline.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsVecMathSSE.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsVecMathUtilities.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsVecQuat.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsVecTransform.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsAtomic.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsCpu.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsFPU.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsMutex.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsPrintString.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsSList.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsSocket.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsSync.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsThread.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsTime.cpp">
+		</ClCompile>
+	</ItemGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\foundation\src\PsAllocator.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\PsAssert.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\PsFoundation.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\PsMathUtils.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\PsString.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\PsTempAllocator.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\PsUtilities.cpp">
+		</ClCompile>
+	</ItemGroup>
+	<ItemGroup>
+	</ItemGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+	<ImportGroup Label="ExtensionTargets"></ImportGroup>
 </Project>
diff --git a/PxShared/src/compiler/vc12win32/PxPvdSDK.vcxproj b/PxShared/src/compiler/vc12win32/PxPvdSDK.vcxproj
index e2824166..b68780b0 100644
--- a/PxShared/src/compiler/vc12win32/PxPvdSDK.vcxproj
+++ b/PxShared/src/compiler/vc12win32/PxPvdSDK.vcxproj
@@ -1,369 +1,425 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project
-    DefaultTargets="Build"
-    ToolsVersion="12.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="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="checked|Win32">
-      <Configuration>checked</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="profile|Win32">
-      <Configuration>profile</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{D4255C0E-3C6E-8A94-959C-54BAC884B25C}</ProjectGuid>
-    <RootNamespace>PxPvdSDK</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"
-      Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='release|Win32'"
-      Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='checked|Win32'"
-      Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='profile|Win32'"
-      Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-  </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
-      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
-      Label="PropertySheets"
-      Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
-    <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)'=='profile|Win32'">
-    <Import
-        Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
-        Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
-        Label="LocalAppDataPlatform"
-    />
-  </ImportGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <OutDir>./../../../bin/vc12win32\</OutDir>
-    <IntDir>./Win32/PxPvdSDK/debug\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>PxPvdSDKDEBUG_x86</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-    <SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../pvd/include;./../../foundation/include;./../../filebuf/include;./../../../../Externals/nvToolsExt/1/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;PX_PVDSDK_DLL=1;PX_FOUNDATION_DLL=1;_DEBUG;PX_DEBUG=1;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>/DELAYLOAD:PxFoundationDEBUG_x86.dll</AdditionalOptions>
-      <AdditionalDependencies>./../../../../Externals/nvToolsExt/1/lib/Win32/nvToolsExt32_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)PxPvdSDKDEBUG_x86.dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <ImportLibrary>./../../../lib/vc12win32/$(TargetName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference></ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <OutDir>./../../../bin/vc12win32\</OutDir>
-    <IntDir>./Win32/PxPvdSDK/release\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>PxPvdSDK_x86</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-    <SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../pvd/include;./../../foundation/include;./../../filebuf/include;./../../../../Externals/nvToolsExt/1/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;PX_PVDSDK_DLL=1;PX_FOUNDATION_DLL=1;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>/INCREMENTAL:NO /DELAYLOAD:PxFoundation_x86.dll</AdditionalOptions>
-      <AdditionalDependencies>./../../../../Externals/nvToolsExt/1/lib/Win32/nvToolsExt32_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)PxPvdSDK_x86.dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <ImportLibrary>./../../../lib/vc12win32/$(TargetName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference></ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
-    <OutDir>./../../../bin/vc12win32\</OutDir>
-    <IntDir>./Win32/PxPvdSDK/checked\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>PxPvdSDKCHECKED_x86</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-    <SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../pvd/include;./../../foundation/include;./../../filebuf/include;./../../../../Externals/nvToolsExt/1/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;PX_PVDSDK_DLL=1;PX_FOUNDATION_DLL=1;NDEBUG;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>/DELAYLOAD:PxFoundationCHECKED_x86.dll</AdditionalOptions>
-      <AdditionalDependencies>./../../../../Externals/nvToolsExt/1/lib/Win32/nvToolsExt32_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)PxPvdSDKCHECKED_x86.dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <ImportLibrary>./../../../lib/vc12win32/$(TargetName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference></ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'">
-    <OutDir>./../../../bin/vc12win32\</OutDir>
-    <IntDir>./Win32/PxPvdSDK/profile\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>PxPvdSDKPROFILE_x86</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-    <SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../pvd/include;./../../foundation/include;./../../filebuf/include;./../../../../Externals/nvToolsExt/1/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;PX_PVDSDK_DLL=1;PX_FOUNDATION_DLL=1;NDEBUG;PX_PROFILE=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>/INCREMENTAL:NO /DELAYLOAD:PxFoundationPROFILE_x86.dll</AdditionalOptions>
-      <AdditionalDependencies>./../../../../Externals/nvToolsExt/1/lib/Win32/nvToolsExt32_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)PxPvdSDKPROFILE_x86.dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <ImportLibrary>./../../../lib/vc12win32/$(TargetName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference></ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\resource_x86\PxPvdSDK.rc"></ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\include\pvd\windows\PxWindowsPvdDelayLoadHook.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\include\pvd\PxPvd.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\pvd\PxPvdTransport.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\pvd\include\PsPvd.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\include\PxProfileAllocatorWrapper.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\include\PxPvdClient.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\include\PxPvdDataStream.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\include\PxPvdDataStreamHelpers.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\include\PxPvdErrorCodes.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\include\PxPvdObjectModelBaseTypes.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\include\PxPvdRenderBuffer.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\include\PxPvdUserRenderer.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\pvd\src\windows\PxWindowsPvdDelayLoadHook.cpp"></ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\pvd\src\PxProfileEventImpl.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvd.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdDataStream.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdDefaultFileTransport.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdDefaultSocketTransport.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdImpl.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdMemClient.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdObjectModelMetaData.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdObjectRegistrar.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdProfileZoneClient.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdUserRenderer.cpp"></ClCompile>
-    <ClInclude Include="..\..\pvd\src\PxProfileBase.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileCompileTimeEventFilter.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileContextProvider.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileContextProviderImpl.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileDataBuffer.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileDataParsing.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventBuffer.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventBufferAtomic.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventBufferClient.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventBufferClientManager.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventFilter.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventHandler.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventId.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventMutex.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventNames.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventParser.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEvents.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventSender.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventSerialization.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventSystem.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemory.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemoryBuffer.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemoryEventBuffer.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemoryEventParser.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemoryEventRecorder.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemoryEventReflexiveWriter.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemoryEvents.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemoryEventSummarizer.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemoryEventTypes.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileScopedEvent.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileScopedMutexLock.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileZone.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileZoneImpl.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileZoneManager.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileZoneManagerImpl.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdBits.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdByteStreams.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdCommStreamEvents.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdCommStreamEventSink.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdCommStreamSDKEventTypes.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdCommStreamTypes.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdDefaultFileTransport.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdDefaultSocketTransport.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdFoundation.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdImpl.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdInternalByteStreams.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdMarshalling.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdMemClient.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdObjectModel.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdObjectModelInternalTypeDefs.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdObjectModelInternalTypes.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdObjectModelMetaData.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdObjectRegistrar.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdProfileZoneClient.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdUserRenderImpl.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdUserRenderTypes.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup></ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="./PxFoundation.vcxproj">
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets"></ImportGroup>
+<Project DefaultTargets="Build" ToolsVersion="12.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="release|Win32">
+			<Configuration>release</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="checked|Win32">
+			<Configuration>checked</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="profile|Win32">
+			<Configuration>profile</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+	</ItemGroup>
+	<PropertyGroup Label="Globals">
+		<ProjectGuid>{D4255C0E-3C6E-8A94-959C-54BAC884B25C}</ProjectGuid>
+		<RootNamespace>PxPvdSDK</RootNamespace>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
+		<ConfigurationType>DynamicLibrary</ConfigurationType>
+		<PlatformToolset>v120</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
+		<ConfigurationType>DynamicLibrary</ConfigurationType>
+		<PlatformToolset>v120</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'" Label="Configuration">
+		<ConfigurationType>DynamicLibrary</ConfigurationType>
+		<PlatformToolset>v120</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'" Label="Configuration">
+		<ConfigurationType>DynamicLibrary</ConfigurationType>
+		<PlatformToolset>v120</PlatformToolset>
+	</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 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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
+		<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)'=='profile|Win32'">
+		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+	</ImportGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
+		<OutDir>./../../../bin/vc12win32\</OutDir>
+		<IntDir>./Win32/PxPvdSDK/debug\</IntDir>
+		<TargetExt>.dll</TargetExt>
+		<TargetName>PxPvdSDKDEBUG_x86</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+		<SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
+			<Optimization>Disabled</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../pvd/include;./../../foundation/include;./../../filebuf/include;./../../../../Externals/nvToolsExt/1/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;PX_PVDSDK_DLL=1;PX_FOUNDATION_DLL=1;_DEBUG;PX_DEBUG=1;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Link>
+			<AdditionalOptions>/DELAYLOAD:PxFoundationDEBUG_x86.dll</AdditionalOptions>
+			<AdditionalDependencies>./../../../../Externals/nvToolsExt/1/lib/Win32/nvToolsExt32_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)PxPvdSDKDEBUG_x86.dll</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<SubSystem>Console</SubSystem>
+			<ImportLibrary>./../../../lib/vc12win32/$(TargetName).lib</ImportLibrary>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<TargetMachine>MachineX86</TargetMachine>
+		</Link>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
+		<OutDir>./../../../bin/vc12win32\</OutDir>
+		<IntDir>./Win32/PxPvdSDK/release\</IntDir>
+		<TargetExt>.dll</TargetExt>
+		<TargetName>PxPvdSDK_x86</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+		<SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../pvd/include;./../../foundation/include;./../../filebuf/include;./../../../../Externals/nvToolsExt/1/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;PX_PVDSDK_DLL=1;PX_FOUNDATION_DLL=1;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Link>
+			<AdditionalOptions>/INCREMENTAL:NO /DELAYLOAD:PxFoundation_x86.dll</AdditionalOptions>
+			<AdditionalDependencies>./../../../../Externals/nvToolsExt/1/lib/Win32/nvToolsExt32_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)PxPvdSDK_x86.dll</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<SubSystem>Console</SubSystem>
+			<ImportLibrary>./../../../lib/vc12win32/$(TargetName).lib</ImportLibrary>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<TargetMachine>MachineX86</TargetMachine>
+		</Link>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
+		<OutDir>./../../../bin/vc12win32\</OutDir>
+		<IntDir>./Win32/PxPvdSDK/checked\</IntDir>
+		<TargetExt>.dll</TargetExt>
+		<TargetName>PxPvdSDKCHECKED_x86</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+		<SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../pvd/include;./../../foundation/include;./../../filebuf/include;./../../../../Externals/nvToolsExt/1/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;PX_PVDSDK_DLL=1;PX_FOUNDATION_DLL=1;NDEBUG;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Link>
+			<AdditionalOptions>/DELAYLOAD:PxFoundationCHECKED_x86.dll</AdditionalOptions>
+			<AdditionalDependencies>./../../../../Externals/nvToolsExt/1/lib/Win32/nvToolsExt32_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)PxPvdSDKCHECKED_x86.dll</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<SubSystem>Console</SubSystem>
+			<ImportLibrary>./../../../lib/vc12win32/$(TargetName).lib</ImportLibrary>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<TargetMachine>MachineX86</TargetMachine>
+		</Link>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'">
+		<OutDir>./../../../bin/vc12win32\</OutDir>
+		<IntDir>./Win32/PxPvdSDK/profile\</IntDir>
+		<TargetExt>.dll</TargetExt>
+		<TargetName>PxPvdSDKPROFILE_x86</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+		<SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../pvd/include;./../../foundation/include;./../../filebuf/include;./../../../../Externals/nvToolsExt/1/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;PX_PVDSDK_DLL=1;PX_FOUNDATION_DLL=1;NDEBUG;PX_PROFILE=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Link>
+			<AdditionalOptions>/INCREMENTAL:NO /DELAYLOAD:PxFoundationPROFILE_x86.dll</AdditionalOptions>
+			<AdditionalDependencies>./../../../../Externals/nvToolsExt/1/lib/Win32/nvToolsExt32_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)PxPvdSDKPROFILE_x86.dll</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<SubSystem>Console</SubSystem>
+			<ImportLibrary>./../../../lib/vc12win32/$(TargetName).lib</ImportLibrary>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<TargetMachine>MachineX86</TargetMachine>
+		</Link>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<ItemGroup>
+		<ResourceCompile Include="..\resource_x86\PxPvdSDK.rc">
+		</ResourceCompile>
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\..\include\pvd\windows\PxWindowsPvdDelayLoadHook.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\..\include\pvd\PxPvd.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\pvd\PxPvdTransport.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\pvd\include\PsPvd.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\include\PxProfileAllocatorWrapper.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\include\PxPvdClient.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\include\PxPvdDataStream.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\include\PxPvdDataStreamHelpers.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\include\PxPvdErrorCodes.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\include\PxPvdObjectModelBaseTypes.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\include\PxPvdRenderBuffer.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\include\PxPvdUserRenderer.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\pvd\src\windows\PxWindowsPvdDelayLoadHook.cpp">
+		</ClCompile>
+	</ItemGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\pvd\src\PxProfileEventImpl.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvd.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdDataStream.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdDefaultFileTransport.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdDefaultSocketTransport.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdImpl.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdMemClient.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdObjectModelMetaData.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdObjectRegistrar.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdProfileZoneClient.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdUserRenderer.cpp">
+		</ClCompile>
+		<ClInclude Include="..\..\pvd\src\PxProfileBase.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileCompileTimeEventFilter.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileContextProvider.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileContextProviderImpl.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileDataBuffer.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileDataParsing.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventBuffer.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventBufferAtomic.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventBufferClient.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventBufferClientManager.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventFilter.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventHandler.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventId.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventMutex.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventNames.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventParser.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEvents.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventSender.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventSerialization.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventSystem.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemory.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemoryBuffer.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemoryEventBuffer.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemoryEventParser.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemoryEventRecorder.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemoryEventReflexiveWriter.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemoryEvents.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemoryEventSummarizer.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemoryEventTypes.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileScopedEvent.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileScopedMutexLock.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileZone.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileZoneImpl.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileZoneManager.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileZoneManagerImpl.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdBits.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdByteStreams.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdCommStreamEvents.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdCommStreamEventSink.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdCommStreamSDKEventTypes.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdCommStreamTypes.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdDefaultFileTransport.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdDefaultSocketTransport.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdFoundation.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdImpl.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdInternalByteStreams.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdMarshalling.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdMemClient.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdObjectModel.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdObjectModelInternalTypeDefs.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdObjectModelInternalTypes.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdObjectModelMetaData.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdObjectRegistrar.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdProfileZoneClient.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdUserRenderImpl.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdUserRenderTypes.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+	</ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="./PxFoundation.vcxproj">
+			<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+		</ProjectReference>
+	</ItemGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+	<ImportGroup Label="ExtensionTargets"></ImportGroup>
 </Project>
diff --git a/PxShared/src/compiler/vc12win32/PxTask.vcxproj b/PxShared/src/compiler/vc12win32/PxTask.vcxproj
index 4388cb89..5a2ab787 100644
--- a/PxShared/src/compiler/vc12win32/PxTask.vcxproj
+++ b/PxShared/src/compiler/vc12win32/PxTask.vcxproj
@@ -1,272 +1,250 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project
-    DefaultTargets="Build"
-    ToolsVersion="12.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="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="checked|Win32">
-      <Configuration>checked</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="profile|Win32">
-      <Configuration>profile</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{5B1132F6-84F8-142E-B951-ADB8505CC27F}</ProjectGuid>
-    <RootNamespace>PxTask</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"
-      Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='release|Win32'"
-      Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='checked|Win32'"
-      Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='profile|Win32'"
-      Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-  </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
-      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
-      Label="PropertySheets"
-      Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
-    <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)'=='profile|Win32'">
-    <Import
-        Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
-        Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
-        Label="LocalAppDataPlatform"
-    />
-  </ImportGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <OutDir>./../../../lib/vc12win32\</OutDir>
-    <IntDir>./Win32/PxTask/debug\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>$(ProjectName)DEBUG_x86</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../task/include;./../../foundation/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;_DEBUG;PX_DEBUG=1;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName)DEBUG_x86.lib</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Lib>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <OutDir>./../../../lib/vc12win32\</OutDir>
-    <IntDir>./Win32/PxTask/release\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>$(ProjectName)_x86</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../task/include;./../../foundation/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName)_x86.lib</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Lib>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
-    <OutDir>./../../../lib/vc12win32\</OutDir>
-    <IntDir>./Win32/PxTask/checked\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>$(ProjectName)CHECKED_x86</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../task/include;./../../foundation/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName)CHECKED_x86.lib</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Lib>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'">
-    <OutDir>./../../../lib/vc12win32\</OutDir>
-    <IntDir>./Win32/PxTask/profile\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>$(ProjectName)PROFILE_x86</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../task/include;./../../foundation/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_PROFILE=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName)PROFILE_x86.lib</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Lib>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\include\task\PxCpuDispatcher.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\task\PxGpuDispatcher.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\task\PxGpuTask.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\task\PxTask.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\task\PxTaskDefine.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\task\PxTaskManager.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\task\src\TaskManager.cpp"></ClCompile>
-  </ItemGroup>
-  <ItemGroup></ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets"></ImportGroup>
+<Project DefaultTargets="Build" ToolsVersion="12.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="release|Win32">
+			<Configuration>release</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="checked|Win32">
+			<Configuration>checked</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="profile|Win32">
+			<Configuration>profile</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+	</ItemGroup>
+	<PropertyGroup Label="Globals">
+		<ProjectGuid>{5B1132F6-84F8-142E-B951-ADB8505CC27F}</ProjectGuid>
+		<RootNamespace>PxTask</RootNamespace>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<PlatformToolset>v120</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<PlatformToolset>v120</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<PlatformToolset>v120</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<PlatformToolset>v120</PlatformToolset>
+	</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 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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
+		<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)'=='profile|Win32'">
+		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+	</ImportGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
+		<OutDir>./../../../lib/vc12win32\</OutDir>
+		<IntDir>./Win32/PxTask/debug\</IntDir>
+		<TargetExt>.lib</TargetExt>
+		<TargetName>$(ProjectName)DEBUG_x86</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
+			<Optimization>Disabled</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../task/include;./../../foundation/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;_DEBUG;PX_DEBUG=1;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Lib>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)$(ProjectName)DEBUG_x86.lib</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<TargetMachine>MachineX86</TargetMachine>
+		</Lib>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+			<LinkLibraryDependencies>true</LinkLibraryDependencies>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
+		<OutDir>./../../../lib/vc12win32\</OutDir>
+		<IntDir>./Win32/PxTask/release\</IntDir>
+		<TargetExt>.lib</TargetExt>
+		<TargetName>$(ProjectName)_x86</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../task/include;./../../foundation/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Lib>
+			<AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)$(ProjectName)_x86.lib</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<TargetMachine>MachineX86</TargetMachine>
+		</Lib>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+			<LinkLibraryDependencies>true</LinkLibraryDependencies>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
+		<OutDir>./../../../lib/vc12win32\</OutDir>
+		<IntDir>./Win32/PxTask/checked\</IntDir>
+		<TargetExt>.lib</TargetExt>
+		<TargetName>$(ProjectName)CHECKED_x86</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../task/include;./../../foundation/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Lib>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)$(ProjectName)CHECKED_x86.lib</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<TargetMachine>MachineX86</TargetMachine>
+		</Lib>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+			<LinkLibraryDependencies>true</LinkLibraryDependencies>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'">
+		<OutDir>./../../../lib/vc12win32\</OutDir>
+		<IntDir>./Win32/PxTask/profile\</IntDir>
+		<TargetExt>.lib</TargetExt>
+		<TargetName>$(ProjectName)PROFILE_x86</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../task/include;./../../foundation/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_PROFILE=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Lib>
+			<AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)$(ProjectName)PROFILE_x86.lib</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<TargetMachine>MachineX86</TargetMachine>
+		</Lib>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+			<LinkLibraryDependencies>true</LinkLibraryDependencies>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\..\include\task\PxCpuDispatcher.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\task\PxGpuDispatcher.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\task\PxGpuTask.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\task\PxTask.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\task\PxTaskDefine.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\task\PxTaskManager.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\task\src\TaskManager.cpp">
+		</ClCompile>
+	</ItemGroup>
+	<ItemGroup>
+	</ItemGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+	<ImportGroup Label="ExtensionTargets"></ImportGroup>
 </Project>
diff --git a/PxShared/src/compiler/vc12win64/PsFastXml.vcxproj b/PxShared/src/compiler/vc12win64/PsFastXml.vcxproj
index 28603ff1..7e0a62ad 100644
--- a/PxShared/src/compiler/vc12win64/PsFastXml.vcxproj
+++ b/PxShared/src/compiler/vc12win64/PsFastXml.vcxproj
@@ -1,262 +1,234 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project
-    DefaultTargets="Build"
-    ToolsVersion="12.0"
-    xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|x64">
-      <Configuration>debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|x64">
-      <Configuration>release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="checked|x64">
-      <Configuration>checked</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="profile|x64">
-      <Configuration>profile</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{82276A9F-CCF0-C50C-BB4A-82ACFFE2A93A}</ProjectGuid>
-    <RootNamespace>PsFastXml</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='debug|x64'"
-      Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='release|x64'"
-      Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='checked|x64'"
-      Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='profile|x64'"
-      Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings"></ImportGroup>
-  <ImportGroup
-      Label="PropertySheets"
-      Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
-    <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|x64'">
-    <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)'=='checked|x64'">
-    <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)'=='profile|x64'">
-    <Import
-        Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
-        Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
-        Label="LocalAppDataPlatform"
-    />
-  </ImportGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
-    <OutDir>./../../../lib/vc12win64\</OutDir>
-    <IntDir>./x64/PsFastXml/debug\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>$(ProjectName)DEBUG_x64</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../foundation/include;./../../fastxml/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>PX_FOUNDATION_DLL=0;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;_DEBUG;PX_DEBUG=1;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName)DEBUG_x64.lib</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Lib>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
-    <OutDir>./../../../lib/vc12win64\</OutDir>
-    <IntDir>./x64/PsFastXml/release\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>$(ProjectName)_x64</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../foundation/include;./../../fastxml/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>PX_FOUNDATION_DLL=0;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName)_x64.lib</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Lib>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'">
-    <OutDir>./../../../lib/vc12win64\</OutDir>
-    <IntDir>./x64/PsFastXml/checked\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>$(ProjectName)CHECKED_x64</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../foundation/include;./../../fastxml/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>PX_FOUNDATION_DLL=0;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName)CHECKED_x64.lib</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Lib>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'">
-    <OutDir>./../../../lib/vc12win64\</OutDir>
-    <IntDir>./x64/PsFastXml/profile\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>$(ProjectName)PROFILE_x64</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../foundation/include;./../../fastxml/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>PX_FOUNDATION_DLL=0;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_PROFILE=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName)PROFILE_x64.lib</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Lib>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\fastxml\include\PsFastXml.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\fastxml\src\PsFastXml.cpp"></ClCompile>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets"></ImportGroup>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<ItemGroup Label="ProjectConfigurations">
+		<ProjectConfiguration Include="debug|x64">
+			<Configuration>debug</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="release|x64">
+			<Configuration>release</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="checked|x64">
+			<Configuration>checked</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="profile|x64">
+			<Configuration>profile</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+	</ItemGroup>
+	<PropertyGroup Label="Globals">
+		<ProjectGuid>{82276A9F-CCF0-C50C-BB4A-82ACFFE2A93A}</ProjectGuid>
+		<RootNamespace>PsFastXml</RootNamespace>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<PlatformToolset>v120</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<PlatformToolset>v120</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<PlatformToolset>v120</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<PlatformToolset>v120</PlatformToolset>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+	<ImportGroup Label="ExtensionSettings">
+	</ImportGroup>
+	<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
+		<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|x64'">
+		<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)'=='checked|x64'">
+		<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)'=='profile|x64'">
+		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+	</ImportGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
+		<OutDir>./../../../lib/vc12win64\</OutDir>
+		<IntDir>./x64/PsFastXml/debug\</IntDir>
+		<TargetExt>.lib</TargetExt>
+		<TargetName>$(ProjectName)DEBUG_x64</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
+			<Optimization>Disabled</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../foundation/include;./../../fastxml/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>PX_FOUNDATION_DLL=0;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;_DEBUG;PX_DEBUG=1;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Lib>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)$(ProjectName)DEBUG_x64.lib</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<TargetMachine>MachineX64</TargetMachine>
+		</Lib>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+			<LinkLibraryDependencies>true</LinkLibraryDependencies>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
+		<OutDir>./../../../lib/vc12win64\</OutDir>
+		<IntDir>./x64/PsFastXml/release\</IntDir>
+		<TargetExt>.lib</TargetExt>
+		<TargetName>$(ProjectName)_x64</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../foundation/include;./../../fastxml/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>PX_FOUNDATION_DLL=0;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Lib>
+			<AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)$(ProjectName)_x64.lib</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<TargetMachine>MachineX64</TargetMachine>
+		</Lib>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+			<LinkLibraryDependencies>true</LinkLibraryDependencies>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'">
+		<OutDir>./../../../lib/vc12win64\</OutDir>
+		<IntDir>./x64/PsFastXml/checked\</IntDir>
+		<TargetExt>.lib</TargetExt>
+		<TargetName>$(ProjectName)CHECKED_x64</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../foundation/include;./../../fastxml/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>PX_FOUNDATION_DLL=0;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Lib>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)$(ProjectName)CHECKED_x64.lib</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<TargetMachine>MachineX64</TargetMachine>
+		</Lib>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+			<LinkLibraryDependencies>true</LinkLibraryDependencies>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'">
+		<OutDir>./../../../lib/vc12win64\</OutDir>
+		<IntDir>./x64/PsFastXml/profile\</IntDir>
+		<TargetExt>.lib</TargetExt>
+		<TargetName>$(ProjectName)PROFILE_x64</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../foundation/include;./../../fastxml/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>PX_FOUNDATION_DLL=0;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_PROFILE=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Lib>
+			<AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)$(ProjectName)PROFILE_x64.lib</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<TargetMachine>MachineX64</TargetMachine>
+		</Lib>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+			<LinkLibraryDependencies>true</LinkLibraryDependencies>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\fastxml\include\PsFastXml.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\fastxml\src\PsFastXml.cpp">
+		</ClCompile>
+	</ItemGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+	<ImportGroup Label="ExtensionTargets"></ImportGroup>
 </Project>
diff --git a/PxShared/src/compiler/vc12win64/PxFoundation.vcxproj b/PxShared/src/compiler/vc12win64/PxFoundation.vcxproj
index c5067a56..d208fe45 100644
--- a/PxShared/src/compiler/vc12win64/PxFoundation.vcxproj
+++ b/PxShared/src/compiler/vc12win64/PxFoundation.vcxproj
@@ -1,376 +1,448 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project
-    DefaultTargets="Build"
-    ToolsVersion="12.0"
-    xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|x64">
-      <Configuration>debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|x64">
-      <Configuration>release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="checked|x64">
-      <Configuration>checked</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="profile|x64">
-      <Configuration>profile</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{DF4537B3-3CE9-1581-10B6-A291FE3299C6}</ProjectGuid>
-    <RootNamespace>PxFoundation</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='debug|x64'"
-      Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='release|x64'"
-      Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='checked|x64'"
-      Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='profile|x64'"
-      Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings"></ImportGroup>
-  <ImportGroup
-      Label="PropertySheets"
-      Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
-    <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|x64'">
-    <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)'=='checked|x64'">
-    <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)'=='profile|x64'">
-    <Import
-        Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
-        Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
-        Label="LocalAppDataPlatform"
-    />
-  </ImportGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
-    <OutDir>./../../../bin/vc12win64\</OutDir>
-    <IntDir>./x64/PxFoundation/debug\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>PxFoundationDEBUG_x64</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-    <SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;$(WindowsSDK_IncludePath);./../../foundation/include;./../../foundation/include/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>PX_FOUNDATION_DLL=1;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;_DEBUG;PX_DEBUG=1;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)PxFoundationDEBUG_x64.dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <ImportLibrary>./../../../lib/vc12win64/$(TargetName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference></ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
-    <OutDir>./../../../bin/vc12win64\</OutDir>
-    <IntDir>./x64/PxFoundation/release\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>PxFoundation_x64</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-    <SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;$(WindowsSDK_IncludePath);./../../foundation/include;./../../foundation/include/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>PX_FOUNDATION_DLL=1;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)PxFoundation_x64.dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <ImportLibrary>./../../../lib/vc12win64/$(TargetName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference></ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'">
-    <OutDir>./../../../bin/vc12win64\</OutDir>
-    <IntDir>./x64/PxFoundation/checked\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>PxFoundationCHECKED_x64</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-    <SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;$(WindowsSDK_IncludePath);./../../foundation/include;./../../foundation/include/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>PX_FOUNDATION_DLL=1;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)PxFoundationCHECKED_x64.dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <ImportLibrary>./../../../lib/vc12win64/$(TargetName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference></ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'">
-    <OutDir>./../../../bin/vc12win64\</OutDir>
-    <IntDir>./x64/PxFoundation/profile\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>PxFoundationPROFILE_x64</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-    <SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;$(WindowsSDK_IncludePath);./../../foundation/include;./../../foundation/include/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>PX_FOUNDATION_DLL=1;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_PROFILE=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)PxFoundationPROFILE_x64.dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <ImportLibrary>./../../../lib/vc12win64/$(TargetName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference></ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\resource_x64\PxFoundation.rc"></ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\include\foundation\windows\PxWindowsFoundationDelayLoadHook.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\windows\PxWindowsIntrinsics.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\include\foundation\Px.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxAllocatorCallback.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxAssert.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxBitAndData.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxBounds3.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxErrorCallback.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxErrors.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxFlags.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxFoundation.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxFoundationVersion.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxIntrinsics.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxIO.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxMat33.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxMat44.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxMath.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxMathUtils.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxMemory.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxPlane.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxPreprocessor.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxProfiler.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxQuat.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxSimpleTypes.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxStrideIterator.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxTransform.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxUnionCast.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxVec2.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxVec3.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxVec4.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\foundation\include\windows\PsWindowsAoS.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\windows\PsWindowsFPU.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\windows\PsWindowsInclude.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\windows\PsWindowsInlineAoS.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\windows\PsWindowsIntrinsics.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\windows\PsWindowsLoadLibrary.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\windows\PsWindowsTrigConstants.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\foundation\include\Ps.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsAlignedMalloc.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsAlloca.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsAllocator.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsAoS.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsArray.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsAtomic.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsBasicTemplates.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsBitUtils.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsBroadcast.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsCpu.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsFoundation.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsFPU.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsHash.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsHashInternals.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsHashMap.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsHashSet.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsInlineAllocator.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsInlineAoS.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsInlineArray.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsIntrinsics.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsMathUtils.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsMutex.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsPool.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsSList.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsSocket.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsSort.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsSortInternals.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsString.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsSync.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsTempAllocator.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsThread.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsTime.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsUserAllocated.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsUtilities.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsVecMath.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsVecMathAoSScalar.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsVecMathAoSScalarInline.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsVecMathSSE.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsVecMathUtilities.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsVecQuat.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsVecTransform.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsAtomic.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsCpu.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsFPU.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsMutex.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsPrintString.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsSList.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsSocket.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsSync.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsThread.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsTime.cpp"></ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\foundation\src\PsAllocator.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\PsAssert.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\PsFoundation.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\PsMathUtils.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\PsString.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\PsTempAllocator.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\PsUtilities.cpp"></ClCompile>
-  </ItemGroup>
-  <ItemGroup></ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets"></ImportGroup>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<ItemGroup Label="ProjectConfigurations">
+		<ProjectConfiguration Include="debug|x64">
+			<Configuration>debug</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="release|x64">
+			<Configuration>release</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="checked|x64">
+			<Configuration>checked</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="profile|x64">
+			<Configuration>profile</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+	</ItemGroup>
+	<PropertyGroup Label="Globals">
+		<ProjectGuid>{DF4537B3-3CE9-1581-10B6-A291FE3299C6}</ProjectGuid>
+		<RootNamespace>PxFoundation</RootNamespace>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'" Label="Configuration">
+		<ConfigurationType>DynamicLibrary</ConfigurationType>
+		<PlatformToolset>v120</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'" Label="Configuration">
+		<ConfigurationType>DynamicLibrary</ConfigurationType>
+		<PlatformToolset>v120</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'" Label="Configuration">
+		<ConfigurationType>DynamicLibrary</ConfigurationType>
+		<PlatformToolset>v120</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'" Label="Configuration">
+		<ConfigurationType>DynamicLibrary</ConfigurationType>
+		<PlatformToolset>v120</PlatformToolset>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+	<ImportGroup Label="ExtensionSettings">
+	</ImportGroup>
+	<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
+		<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|x64'">
+		<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)'=='checked|x64'">
+		<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)'=='profile|x64'">
+		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+	</ImportGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
+		<OutDir>./../../../bin/vc12win64\</OutDir>
+		<IntDir>./x64/PxFoundation/debug\</IntDir>
+		<TargetExt>.dll</TargetExt>
+		<TargetName>PxFoundationDEBUG_x64</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+		<SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
+			<Optimization>Disabled</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;$(WindowsSDK_IncludePath);./../../foundation/include;./../../foundation/include/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>PX_FOUNDATION_DLL=1;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;_DEBUG;PX_DEBUG=1;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Link>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)PxFoundationDEBUG_x64.dll</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<SubSystem>Console</SubSystem>
+			<ImportLibrary>./../../../lib/vc12win64/$(TargetName).lib</ImportLibrary>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<TargetMachine>MachineX64</TargetMachine>
+		</Link>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
+		<OutDir>./../../../bin/vc12win64\</OutDir>
+		<IntDir>./x64/PxFoundation/release\</IntDir>
+		<TargetExt>.dll</TargetExt>
+		<TargetName>PxFoundation_x64</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+		<SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;$(WindowsSDK_IncludePath);./../../foundation/include;./../../foundation/include/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>PX_FOUNDATION_DLL=1;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Link>
+			<AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)PxFoundation_x64.dll</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<SubSystem>Console</SubSystem>
+			<ImportLibrary>./../../../lib/vc12win64/$(TargetName).lib</ImportLibrary>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<TargetMachine>MachineX64</TargetMachine>
+		</Link>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'">
+		<OutDir>./../../../bin/vc12win64\</OutDir>
+		<IntDir>./x64/PxFoundation/checked\</IntDir>
+		<TargetExt>.dll</TargetExt>
+		<TargetName>PxFoundationCHECKED_x64</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+		<SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;$(WindowsSDK_IncludePath);./../../foundation/include;./../../foundation/include/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>PX_FOUNDATION_DLL=1;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Link>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)PxFoundationCHECKED_x64.dll</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<SubSystem>Console</SubSystem>
+			<ImportLibrary>./../../../lib/vc12win64/$(TargetName).lib</ImportLibrary>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<TargetMachine>MachineX64</TargetMachine>
+		</Link>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'">
+		<OutDir>./../../../bin/vc12win64\</OutDir>
+		<IntDir>./x64/PxFoundation/profile\</IntDir>
+		<TargetExt>.dll</TargetExt>
+		<TargetName>PxFoundationPROFILE_x64</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+		<SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;$(WindowsSDK_IncludePath);./../../foundation/include;./../../foundation/include/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>PX_FOUNDATION_DLL=1;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_PROFILE=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Link>
+			<AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)PxFoundationPROFILE_x64.dll</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<SubSystem>Console</SubSystem>
+			<ImportLibrary>./../../../lib/vc12win64/$(TargetName).lib</ImportLibrary>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<TargetMachine>MachineX64</TargetMachine>
+		</Link>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<ItemGroup>
+		<ResourceCompile Include="..\resource_x64\PxFoundation.rc">
+		</ResourceCompile>
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\..\include\foundation\windows\PxWindowsFoundationDelayLoadHook.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\windows\PxWindowsIntrinsics.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\..\include\foundation\Px.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxAllocatorCallback.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxAssert.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxBitAndData.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxBounds3.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxErrorCallback.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxErrors.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxFlags.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxFoundation.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxFoundationVersion.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxIntrinsics.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxIO.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxMat33.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxMat44.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxMath.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxMathUtils.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxMemory.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxPlane.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxPreprocessor.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxProfiler.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxQuat.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxSimpleTypes.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxStrideIterator.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxTransform.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxUnionCast.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxVec2.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxVec3.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxVec4.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\foundation\include\windows\PsWindowsAoS.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\windows\PsWindowsFPU.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\windows\PsWindowsInclude.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\windows\PsWindowsInlineAoS.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\windows\PsWindowsIntrinsics.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\windows\PsWindowsLoadLibrary.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\windows\PsWindowsTrigConstants.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\foundation\include\Ps.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsAlignedMalloc.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsAlloca.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsAllocator.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsAoS.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsArray.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsAtomic.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsBasicTemplates.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsBitUtils.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsBroadcast.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsCpu.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsFoundation.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsFPU.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsHash.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsHashInternals.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsHashMap.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsHashSet.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsInlineAllocator.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsInlineAoS.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsInlineArray.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsIntrinsics.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsMathUtils.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsMutex.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsPool.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsSList.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsSocket.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsSort.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsSortInternals.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsString.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsSync.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsTempAllocator.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsThread.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsTime.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsUserAllocated.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsUtilities.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsVecMath.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsVecMathAoSScalar.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsVecMathAoSScalarInline.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsVecMathSSE.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsVecMathUtilities.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsVecQuat.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsVecTransform.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsAtomic.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsCpu.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsFPU.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsMutex.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsPrintString.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsSList.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsSocket.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsSync.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsThread.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsTime.cpp">
+		</ClCompile>
+	</ItemGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\foundation\src\PsAllocator.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\PsAssert.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\PsFoundation.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\PsMathUtils.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\PsString.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\PsTempAllocator.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\PsUtilities.cpp">
+		</ClCompile>
+	</ItemGroup>
+	<ItemGroup>
+	</ItemGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+	<ImportGroup Label="ExtensionTargets"></ImportGroup>
 </Project>
diff --git a/PxShared/src/compiler/vc12win64/PxPvdSDK.vcxproj b/PxShared/src/compiler/vc12win64/PxPvdSDK.vcxproj
index b20007c1..a45e1315 100644
--- a/PxShared/src/compiler/vc12win64/PxPvdSDK.vcxproj
+++ b/PxShared/src/compiler/vc12win64/PxPvdSDK.vcxproj
@@ -1,365 +1,421 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project
-    DefaultTargets="Build"
-    ToolsVersion="12.0"
-    xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|x64">
-      <Configuration>debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|x64">
-      <Configuration>release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="checked|x64">
-      <Configuration>checked</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="profile|x64">
-      <Configuration>profile</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{D4255C0E-3C6E-8A94-959C-54BAC884B25C}</ProjectGuid>
-    <RootNamespace>PxPvdSDK</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='debug|x64'"
-      Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='release|x64'"
-      Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='checked|x64'"
-      Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='profile|x64'"
-      Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings"></ImportGroup>
-  <ImportGroup
-      Label="PropertySheets"
-      Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
-    <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|x64'">
-    <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)'=='checked|x64'">
-    <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)'=='profile|x64'">
-    <Import
-        Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
-        Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
-        Label="LocalAppDataPlatform"
-    />
-  </ImportGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
-    <OutDir>./../../../bin/vc12win64\</OutDir>
-    <IntDir>./x64/PxPvdSDK/debug\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>PxPvdSDKDEBUG_x64</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-    <SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../pvd/include;./../../foundation/include;./../../filebuf/include;./../../../../Externals/nvToolsExt/1/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;PX_PVDSDK_DLL=1;PX_FOUNDATION_DLL=1;_DEBUG;PX_DEBUG=1;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>/DELAYLOAD:PxFoundationDEBUG_x64.dll</AdditionalOptions>
-      <AdditionalDependencies>./../../../../Externals/nvToolsExt/1/lib/x64/nvToolsExt64_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)PxPvdSDKDEBUG_x64.dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <ImportLibrary>./../../../lib/vc12win64/$(TargetName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference></ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
-    <OutDir>./../../../bin/vc12win64\</OutDir>
-    <IntDir>./x64/PxPvdSDK/release\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>PxPvdSDK_x64</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-    <SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../pvd/include;./../../foundation/include;./../../filebuf/include;./../../../../Externals/nvToolsExt/1/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;PX_PVDSDK_DLL=1;PX_FOUNDATION_DLL=1;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>/INCREMENTAL:NO /DELAYLOAD:PxFoundation_x64.dll</AdditionalOptions>
-      <AdditionalDependencies>./../../../../Externals/nvToolsExt/1/lib/x64/nvToolsExt64_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)PxPvdSDK_x64.dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <ImportLibrary>./../../../lib/vc12win64/$(TargetName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference></ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'">
-    <OutDir>./../../../bin/vc12win64\</OutDir>
-    <IntDir>./x64/PxPvdSDK/checked\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>PxPvdSDKCHECKED_x64</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-    <SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../pvd/include;./../../foundation/include;./../../filebuf/include;./../../../../Externals/nvToolsExt/1/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;PX_PVDSDK_DLL=1;PX_FOUNDATION_DLL=1;NDEBUG;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>/DELAYLOAD:PxFoundationCHECKED_x64.dll</AdditionalOptions>
-      <AdditionalDependencies>./../../../../Externals/nvToolsExt/1/lib/x64/nvToolsExt64_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)PxPvdSDKCHECKED_x64.dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <ImportLibrary>./../../../lib/vc12win64/$(TargetName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference></ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'">
-    <OutDir>./../../../bin/vc12win64\</OutDir>
-    <IntDir>./x64/PxPvdSDK/profile\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>PxPvdSDKPROFILE_x64</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-    <SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../pvd/include;./../../foundation/include;./../../filebuf/include;./../../../../Externals/nvToolsExt/1/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;PX_PVDSDK_DLL=1;PX_FOUNDATION_DLL=1;NDEBUG;PX_PROFILE=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>/INCREMENTAL:NO /DELAYLOAD:PxFoundationPROFILE_x64.dll</AdditionalOptions>
-      <AdditionalDependencies>./../../../../Externals/nvToolsExt/1/lib/x64/nvToolsExt64_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)PxPvdSDKPROFILE_x64.dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <ImportLibrary>./../../../lib/vc12win64/$(TargetName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference></ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\resource_x64\PxPvdSDK.rc"></ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\include\pvd\windows\PxWindowsPvdDelayLoadHook.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\include\pvd\PxPvd.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\pvd\PxPvdTransport.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\pvd\include\PsPvd.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\include\PxProfileAllocatorWrapper.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\include\PxPvdClient.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\include\PxPvdDataStream.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\include\PxPvdDataStreamHelpers.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\include\PxPvdErrorCodes.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\include\PxPvdObjectModelBaseTypes.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\include\PxPvdRenderBuffer.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\include\PxPvdUserRenderer.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\pvd\src\windows\PxWindowsPvdDelayLoadHook.cpp"></ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\pvd\src\PxProfileEventImpl.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvd.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdDataStream.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdDefaultFileTransport.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdDefaultSocketTransport.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdImpl.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdMemClient.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdObjectModelMetaData.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdObjectRegistrar.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdProfileZoneClient.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdUserRenderer.cpp"></ClCompile>
-    <ClInclude Include="..\..\pvd\src\PxProfileBase.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileCompileTimeEventFilter.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileContextProvider.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileContextProviderImpl.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileDataBuffer.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileDataParsing.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventBuffer.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventBufferAtomic.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventBufferClient.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventBufferClientManager.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventFilter.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventHandler.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventId.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventMutex.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventNames.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventParser.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEvents.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventSender.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventSerialization.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventSystem.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemory.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemoryBuffer.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemoryEventBuffer.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemoryEventParser.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemoryEventRecorder.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemoryEventReflexiveWriter.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemoryEvents.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemoryEventSummarizer.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemoryEventTypes.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileScopedEvent.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileScopedMutexLock.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileZone.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileZoneImpl.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileZoneManager.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileZoneManagerImpl.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdBits.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdByteStreams.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdCommStreamEvents.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdCommStreamEventSink.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdCommStreamSDKEventTypes.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdCommStreamTypes.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdDefaultFileTransport.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdDefaultSocketTransport.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdFoundation.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdImpl.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdInternalByteStreams.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdMarshalling.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdMemClient.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdObjectModel.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdObjectModelInternalTypeDefs.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdObjectModelInternalTypes.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdObjectModelMetaData.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdObjectRegistrar.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdProfileZoneClient.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdUserRenderImpl.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdUserRenderTypes.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup></ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="./PxFoundation.vcxproj">
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets"></ImportGroup>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<ItemGroup Label="ProjectConfigurations">
+		<ProjectConfiguration Include="debug|x64">
+			<Configuration>debug</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="release|x64">
+			<Configuration>release</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="checked|x64">
+			<Configuration>checked</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="profile|x64">
+			<Configuration>profile</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+	</ItemGroup>
+	<PropertyGroup Label="Globals">
+		<ProjectGuid>{D4255C0E-3C6E-8A94-959C-54BAC884B25C}</ProjectGuid>
+		<RootNamespace>PxPvdSDK</RootNamespace>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'" Label="Configuration">
+		<ConfigurationType>DynamicLibrary</ConfigurationType>
+		<PlatformToolset>v120</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'" Label="Configuration">
+		<ConfigurationType>DynamicLibrary</ConfigurationType>
+		<PlatformToolset>v120</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'" Label="Configuration">
+		<ConfigurationType>DynamicLibrary</ConfigurationType>
+		<PlatformToolset>v120</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'" Label="Configuration">
+		<ConfigurationType>DynamicLibrary</ConfigurationType>
+		<PlatformToolset>v120</PlatformToolset>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+	<ImportGroup Label="ExtensionSettings">
+	</ImportGroup>
+	<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
+		<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|x64'">
+		<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)'=='checked|x64'">
+		<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)'=='profile|x64'">
+		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+	</ImportGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
+		<OutDir>./../../../bin/vc12win64\</OutDir>
+		<IntDir>./x64/PxPvdSDK/debug\</IntDir>
+		<TargetExt>.dll</TargetExt>
+		<TargetName>PxPvdSDKDEBUG_x64</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+		<SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
+			<Optimization>Disabled</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../pvd/include;./../../foundation/include;./../../filebuf/include;./../../../../Externals/nvToolsExt/1/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;PX_PVDSDK_DLL=1;PX_FOUNDATION_DLL=1;_DEBUG;PX_DEBUG=1;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Link>
+			<AdditionalOptions>/DELAYLOAD:PxFoundationDEBUG_x64.dll</AdditionalOptions>
+			<AdditionalDependencies>./../../../../Externals/nvToolsExt/1/lib/x64/nvToolsExt64_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)PxPvdSDKDEBUG_x64.dll</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<SubSystem>Console</SubSystem>
+			<ImportLibrary>./../../../lib/vc12win64/$(TargetName).lib</ImportLibrary>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<TargetMachine>MachineX64</TargetMachine>
+		</Link>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
+		<OutDir>./../../../bin/vc12win64\</OutDir>
+		<IntDir>./x64/PxPvdSDK/release\</IntDir>
+		<TargetExt>.dll</TargetExt>
+		<TargetName>PxPvdSDK_x64</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+		<SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../pvd/include;./../../foundation/include;./../../filebuf/include;./../../../../Externals/nvToolsExt/1/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;PX_PVDSDK_DLL=1;PX_FOUNDATION_DLL=1;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Link>
+			<AdditionalOptions>/INCREMENTAL:NO /DELAYLOAD:PxFoundation_x64.dll</AdditionalOptions>
+			<AdditionalDependencies>./../../../../Externals/nvToolsExt/1/lib/x64/nvToolsExt64_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)PxPvdSDK_x64.dll</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<SubSystem>Console</SubSystem>
+			<ImportLibrary>./../../../lib/vc12win64/$(TargetName).lib</ImportLibrary>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<TargetMachine>MachineX64</TargetMachine>
+		</Link>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'">
+		<OutDir>./../../../bin/vc12win64\</OutDir>
+		<IntDir>./x64/PxPvdSDK/checked\</IntDir>
+		<TargetExt>.dll</TargetExt>
+		<TargetName>PxPvdSDKCHECKED_x64</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+		<SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../pvd/include;./../../foundation/include;./../../filebuf/include;./../../../../Externals/nvToolsExt/1/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;PX_PVDSDK_DLL=1;PX_FOUNDATION_DLL=1;NDEBUG;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Link>
+			<AdditionalOptions>/DELAYLOAD:PxFoundationCHECKED_x64.dll</AdditionalOptions>
+			<AdditionalDependencies>./../../../../Externals/nvToolsExt/1/lib/x64/nvToolsExt64_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)PxPvdSDKCHECKED_x64.dll</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<SubSystem>Console</SubSystem>
+			<ImportLibrary>./../../../lib/vc12win64/$(TargetName).lib</ImportLibrary>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<TargetMachine>MachineX64</TargetMachine>
+		</Link>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'">
+		<OutDir>./../../../bin/vc12win64\</OutDir>
+		<IntDir>./x64/PxPvdSDK/profile\</IntDir>
+		<TargetExt>.dll</TargetExt>
+		<TargetName>PxPvdSDKPROFILE_x64</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+		<SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../pvd/include;./../../foundation/include;./../../filebuf/include;./../../../../Externals/nvToolsExt/1/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;PX_PVDSDK_DLL=1;PX_FOUNDATION_DLL=1;NDEBUG;PX_PROFILE=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Link>
+			<AdditionalOptions>/INCREMENTAL:NO /DELAYLOAD:PxFoundationPROFILE_x64.dll</AdditionalOptions>
+			<AdditionalDependencies>./../../../../Externals/nvToolsExt/1/lib/x64/nvToolsExt64_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)PxPvdSDKPROFILE_x64.dll</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<SubSystem>Console</SubSystem>
+			<ImportLibrary>./../../../lib/vc12win64/$(TargetName).lib</ImportLibrary>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<TargetMachine>MachineX64</TargetMachine>
+		</Link>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<ItemGroup>
+		<ResourceCompile Include="..\resource_x64\PxPvdSDK.rc">
+		</ResourceCompile>
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\..\include\pvd\windows\PxWindowsPvdDelayLoadHook.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\..\include\pvd\PxPvd.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\pvd\PxPvdTransport.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\pvd\include\PsPvd.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\include\PxProfileAllocatorWrapper.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\include\PxPvdClient.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\include\PxPvdDataStream.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\include\PxPvdDataStreamHelpers.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\include\PxPvdErrorCodes.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\include\PxPvdObjectModelBaseTypes.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\include\PxPvdRenderBuffer.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\include\PxPvdUserRenderer.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\pvd\src\windows\PxWindowsPvdDelayLoadHook.cpp">
+		</ClCompile>
+	</ItemGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\pvd\src\PxProfileEventImpl.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvd.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdDataStream.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdDefaultFileTransport.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdDefaultSocketTransport.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdImpl.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdMemClient.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdObjectModelMetaData.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdObjectRegistrar.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdProfileZoneClient.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdUserRenderer.cpp">
+		</ClCompile>
+		<ClInclude Include="..\..\pvd\src\PxProfileBase.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileCompileTimeEventFilter.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileContextProvider.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileContextProviderImpl.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileDataBuffer.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileDataParsing.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventBuffer.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventBufferAtomic.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventBufferClient.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventBufferClientManager.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventFilter.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventHandler.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventId.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventMutex.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventNames.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventParser.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEvents.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventSender.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventSerialization.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventSystem.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemory.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemoryBuffer.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemoryEventBuffer.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemoryEventParser.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemoryEventRecorder.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemoryEventReflexiveWriter.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemoryEvents.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemoryEventSummarizer.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemoryEventTypes.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileScopedEvent.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileScopedMutexLock.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileZone.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileZoneImpl.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileZoneManager.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileZoneManagerImpl.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdBits.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdByteStreams.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdCommStreamEvents.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdCommStreamEventSink.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdCommStreamSDKEventTypes.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdCommStreamTypes.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdDefaultFileTransport.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdDefaultSocketTransport.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdFoundation.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdImpl.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdInternalByteStreams.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdMarshalling.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdMemClient.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdObjectModel.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdObjectModelInternalTypeDefs.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdObjectModelInternalTypes.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdObjectModelMetaData.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdObjectRegistrar.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdProfileZoneClient.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdUserRenderImpl.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdUserRenderTypes.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+	</ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="./PxFoundation.vcxproj">
+			<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+		</ProjectReference>
+	</ItemGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+	<ImportGroup Label="ExtensionTargets"></ImportGroup>
 </Project>
diff --git a/PxShared/src/compiler/vc12win64/PxTask.vcxproj b/PxShared/src/compiler/vc12win64/PxTask.vcxproj
index 07950976..71bc5c43 100644
--- a/PxShared/src/compiler/vc12win64/PxTask.vcxproj
+++ b/PxShared/src/compiler/vc12win64/PxTask.vcxproj
@@ -1,268 +1,246 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project
-    DefaultTargets="Build"
-    ToolsVersion="12.0"
-    xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|x64">
-      <Configuration>debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|x64">
-      <Configuration>release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="checked|x64">
-      <Configuration>checked</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="profile|x64">
-      <Configuration>profile</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{5B1132F6-84F8-142E-B951-ADB8505CC27F}</ProjectGuid>
-    <RootNamespace>PxTask</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='debug|x64'"
-      Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='release|x64'"
-      Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='checked|x64'"
-      Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='profile|x64'"
-      Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings"></ImportGroup>
-  <ImportGroup
-      Label="PropertySheets"
-      Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
-    <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|x64'">
-    <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)'=='checked|x64'">
-    <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)'=='profile|x64'">
-    <Import
-        Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
-        Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
-        Label="LocalAppDataPlatform"
-    />
-  </ImportGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
-    <OutDir>./../../../lib/vc12win64\</OutDir>
-    <IntDir>./x64/PxTask/debug\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>$(ProjectName)DEBUG_x64</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../task/include;./../../foundation/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;_DEBUG;PX_DEBUG=1;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName)DEBUG_x64.lib</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Lib>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
-    <OutDir>./../../../lib/vc12win64\</OutDir>
-    <IntDir>./x64/PxTask/release\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>$(ProjectName)_x64</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../task/include;./../../foundation/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName)_x64.lib</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Lib>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'">
-    <OutDir>./../../../lib/vc12win64\</OutDir>
-    <IntDir>./x64/PxTask/checked\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>$(ProjectName)CHECKED_x64</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../task/include;./../../foundation/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName)CHECKED_x64.lib</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Lib>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'">
-    <OutDir>./../../../lib/vc12win64\</OutDir>
-    <IntDir>./x64/PxTask/profile\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>$(ProjectName)PROFILE_x64</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../task/include;./../../foundation/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_PROFILE=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName)PROFILE_x64.lib</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Lib>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\include\task\PxCpuDispatcher.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\task\PxGpuDispatcher.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\task\PxGpuTask.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\task\PxTask.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\task\PxTaskDefine.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\task\PxTaskManager.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\task\src\TaskManager.cpp"></ClCompile>
-  </ItemGroup>
-  <ItemGroup></ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets"></ImportGroup>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<ItemGroup Label="ProjectConfigurations">
+		<ProjectConfiguration Include="debug|x64">
+			<Configuration>debug</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="release|x64">
+			<Configuration>release</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="checked|x64">
+			<Configuration>checked</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="profile|x64">
+			<Configuration>profile</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+	</ItemGroup>
+	<PropertyGroup Label="Globals">
+		<ProjectGuid>{5B1132F6-84F8-142E-B951-ADB8505CC27F}</ProjectGuid>
+		<RootNamespace>PxTask</RootNamespace>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<PlatformToolset>v120</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<PlatformToolset>v120</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<PlatformToolset>v120</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<PlatformToolset>v120</PlatformToolset>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+	<ImportGroup Label="ExtensionSettings">
+	</ImportGroup>
+	<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
+		<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|x64'">
+		<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)'=='checked|x64'">
+		<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)'=='profile|x64'">
+		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+	</ImportGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
+		<OutDir>./../../../lib/vc12win64\</OutDir>
+		<IntDir>./x64/PxTask/debug\</IntDir>
+		<TargetExt>.lib</TargetExt>
+		<TargetName>$(ProjectName)DEBUG_x64</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
+			<Optimization>Disabled</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../task/include;./../../foundation/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;_DEBUG;PX_DEBUG=1;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Lib>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)$(ProjectName)DEBUG_x64.lib</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<TargetMachine>MachineX64</TargetMachine>
+		</Lib>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+			<LinkLibraryDependencies>true</LinkLibraryDependencies>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
+		<OutDir>./../../../lib/vc12win64\</OutDir>
+		<IntDir>./x64/PxTask/release\</IntDir>
+		<TargetExt>.lib</TargetExt>
+		<TargetName>$(ProjectName)_x64</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../task/include;./../../foundation/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Lib>
+			<AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)$(ProjectName)_x64.lib</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<TargetMachine>MachineX64</TargetMachine>
+		</Lib>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+			<LinkLibraryDependencies>true</LinkLibraryDependencies>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'">
+		<OutDir>./../../../lib/vc12win64\</OutDir>
+		<IntDir>./x64/PxTask/checked\</IntDir>
+		<TargetExt>.lib</TargetExt>
+		<TargetName>$(ProjectName)CHECKED_x64</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../task/include;./../../foundation/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Lib>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)$(ProjectName)CHECKED_x64.lib</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<TargetMachine>MachineX64</TargetMachine>
+		</Lib>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+			<LinkLibraryDependencies>true</LinkLibraryDependencies>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'">
+		<OutDir>./../../../lib/vc12win64\</OutDir>
+		<IntDir>./x64/PxTask/profile\</IntDir>
+		<TargetExt>.lib</TargetExt>
+		<TargetName>$(ProjectName)PROFILE_x64</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../task/include;./../../foundation/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_PROFILE=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Lib>
+			<AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)$(ProjectName)PROFILE_x64.lib</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<TargetMachine>MachineX64</TargetMachine>
+		</Lib>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+			<LinkLibraryDependencies>true</LinkLibraryDependencies>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\..\include\task\PxCpuDispatcher.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\task\PxGpuDispatcher.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\task\PxGpuTask.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\task\PxTask.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\task\PxTaskDefine.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\task\PxTaskManager.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\task\src\TaskManager.cpp">
+		</ClCompile>
+	</ItemGroup>
+	<ItemGroup>
+	</ItemGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+	<ImportGroup Label="ExtensionTargets"></ImportGroup>
 </Project>
diff --git a/PxShared/src/compiler/vc14win32/PsFastXml.vcxproj b/PxShared/src/compiler/vc14win32/PsFastXml.vcxproj
index cebf90f5..af1cb992 100644
--- a/PxShared/src/compiler/vc14win32/PsFastXml.vcxproj
+++ b/PxShared/src/compiler/vc14win32/PsFastXml.vcxproj
@@ -1,266 +1,238 @@
 <?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="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="checked|Win32">
-      <Configuration>checked</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="profile|Win32">
-      <Configuration>profile</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{82276A9F-CCF0-C50C-BB4A-82ACFFE2A93A}</ProjectGuid>
-    <RootNamespace>PsFastXml</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"
-      Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='release|Win32'"
-      Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='checked|Win32'"
-      Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='profile|Win32'"
-      Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
-  </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
-      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
-      Label="PropertySheets"
-      Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
-    <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)'=='profile|Win32'">
-    <Import
-        Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
-        Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
-        Label="LocalAppDataPlatform"
-    />
-  </ImportGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <OutDir>./../../../lib/vc14win32\</OutDir>
-    <IntDir>./Win32/PsFastXml/debug\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>$(ProjectName)DEBUG_x86</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../foundation/include;./../../fastxml/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>PX_FOUNDATION_DLL=0;WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;_DEBUG;PX_DEBUG=1;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName)DEBUG_x86.lib</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Lib>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <OutDir>./../../../lib/vc14win32\</OutDir>
-    <IntDir>./Win32/PsFastXml/release\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>$(ProjectName)_x86</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../foundation/include;./../../fastxml/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>PX_FOUNDATION_DLL=0;WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName)_x86.lib</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Lib>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
-    <OutDir>./../../../lib/vc14win32\</OutDir>
-    <IntDir>./Win32/PsFastXml/checked\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>$(ProjectName)CHECKED_x86</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../foundation/include;./../../fastxml/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>PX_FOUNDATION_DLL=0;WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName)CHECKED_x86.lib</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Lib>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'">
-    <OutDir>./../../../lib/vc14win32\</OutDir>
-    <IntDir>./Win32/PsFastXml/profile\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>$(ProjectName)PROFILE_x86</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../foundation/include;./../../fastxml/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>PX_FOUNDATION_DLL=0;WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_PROFILE=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName)PROFILE_x86.lib</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Lib>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\fastxml\include\PsFastXml.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\fastxml\src\PsFastXml.cpp"></ClCompile>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets"></ImportGroup>
+<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="release|Win32">
+			<Configuration>release</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="checked|Win32">
+			<Configuration>checked</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="profile|Win32">
+			<Configuration>profile</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+	</ItemGroup>
+	<PropertyGroup Label="Globals">
+		<ProjectGuid>{82276A9F-CCF0-C50C-BB4A-82ACFFE2A93A}</ProjectGuid>
+		<RootNamespace>PsFastXml</RootNamespace>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<PlatformToolset>v140</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<PlatformToolset>v140</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<PlatformToolset>v140</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<PlatformToolset>v140</PlatformToolset>
+	</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 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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
+		<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)'=='profile|Win32'">
+		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+	</ImportGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
+		<OutDir>./../../../lib/vc14win32\</OutDir>
+		<IntDir>./Win32/PsFastXml/debug\</IntDir>
+		<TargetExt>.lib</TargetExt>
+		<TargetName>$(ProjectName)DEBUG_x86</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
+			<Optimization>Disabled</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../foundation/include;./../../fastxml/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>PX_FOUNDATION_DLL=0;WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;_DEBUG;PX_DEBUG=1;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Lib>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)$(ProjectName)DEBUG_x86.lib</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<TargetMachine>MachineX86</TargetMachine>
+		</Lib>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+			<LinkLibraryDependencies>true</LinkLibraryDependencies>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
+		<OutDir>./../../../lib/vc14win32\</OutDir>
+		<IntDir>./Win32/PsFastXml/release\</IntDir>
+		<TargetExt>.lib</TargetExt>
+		<TargetName>$(ProjectName)_x86</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../foundation/include;./../../fastxml/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>PX_FOUNDATION_DLL=0;WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Lib>
+			<AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)$(ProjectName)_x86.lib</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<TargetMachine>MachineX86</TargetMachine>
+		</Lib>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+			<LinkLibraryDependencies>true</LinkLibraryDependencies>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
+		<OutDir>./../../../lib/vc14win32\</OutDir>
+		<IntDir>./Win32/PsFastXml/checked\</IntDir>
+		<TargetExt>.lib</TargetExt>
+		<TargetName>$(ProjectName)CHECKED_x86</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../foundation/include;./../../fastxml/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>PX_FOUNDATION_DLL=0;WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Lib>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)$(ProjectName)CHECKED_x86.lib</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<TargetMachine>MachineX86</TargetMachine>
+		</Lib>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+			<LinkLibraryDependencies>true</LinkLibraryDependencies>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'">
+		<OutDir>./../../../lib/vc14win32\</OutDir>
+		<IntDir>./Win32/PsFastXml/profile\</IntDir>
+		<TargetExt>.lib</TargetExt>
+		<TargetName>$(ProjectName)PROFILE_x86</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../foundation/include;./../../fastxml/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>PX_FOUNDATION_DLL=0;WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_PROFILE=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Lib>
+			<AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)$(ProjectName)PROFILE_x86.lib</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<TargetMachine>MachineX86</TargetMachine>
+		</Lib>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+			<LinkLibraryDependencies>true</LinkLibraryDependencies>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\fastxml\include\PsFastXml.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\fastxml\src\PsFastXml.cpp">
+		</ClCompile>
+	</ItemGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+	<ImportGroup Label="ExtensionTargets"></ImportGroup>
 </Project>
diff --git a/PxShared/src/compiler/vc14win32/PxFoundation.vcxproj b/PxShared/src/compiler/vc14win32/PxFoundation.vcxproj
index f08b20d9..a2988c96 100644
--- a/PxShared/src/compiler/vc14win32/PxFoundation.vcxproj
+++ b/PxShared/src/compiler/vc14win32/PxFoundation.vcxproj
@@ -1,380 +1,452 @@
 <?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="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="checked|Win32">
-      <Configuration>checked</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="profile|Win32">
-      <Configuration>profile</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{DF4537B3-3CE9-1581-10B6-A291FE3299C6}</ProjectGuid>
-    <RootNamespace>PxFoundation</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"
-      Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='release|Win32'"
-      Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='checked|Win32'"
-      Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='profile|Win32'"
-      Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
-  </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
-      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
-      Label="PropertySheets"
-      Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
-    <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)'=='profile|Win32'">
-    <Import
-        Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
-        Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
-        Label="LocalAppDataPlatform"
-    />
-  </ImportGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <OutDir>./../../../bin/vc14win32\</OutDir>
-    <IntDir>./Win32/PxFoundation/debug\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>PxFoundationDEBUG_x86</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-    <SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;$(WindowsSDK_IncludePath);./../../foundation/include;./../../foundation/include/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>PX_FOUNDATION_DLL=1;WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;_DEBUG;PX_DEBUG=1;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)PxFoundationDEBUG_x86.dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <ImportLibrary>./../../../lib/vc14win32/$(TargetName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference></ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <OutDir>./../../../bin/vc14win32\</OutDir>
-    <IntDir>./Win32/PxFoundation/release\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>PxFoundation_x86</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-    <SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;$(WindowsSDK_IncludePath);./../../foundation/include;./../../foundation/include/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>PX_FOUNDATION_DLL=1;WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)PxFoundation_x86.dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <ImportLibrary>./../../../lib/vc14win32/$(TargetName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference></ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
-    <OutDir>./../../../bin/vc14win32\</OutDir>
-    <IntDir>./Win32/PxFoundation/checked\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>PxFoundationCHECKED_x86</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-    <SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;$(WindowsSDK_IncludePath);./../../foundation/include;./../../foundation/include/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>PX_FOUNDATION_DLL=1;WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)PxFoundationCHECKED_x86.dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <ImportLibrary>./../../../lib/vc14win32/$(TargetName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference></ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'">
-    <OutDir>./../../../bin/vc14win32\</OutDir>
-    <IntDir>./Win32/PxFoundation/profile\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>PxFoundationPROFILE_x86</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-    <SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;$(WindowsSDK_IncludePath);./../../foundation/include;./../../foundation/include/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>PX_FOUNDATION_DLL=1;WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_PROFILE=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)PxFoundationPROFILE_x86.dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <ImportLibrary>./../../../lib/vc14win32/$(TargetName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference></ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\resource_x86\PxFoundation.rc"></ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\include\foundation\windows\PxWindowsFoundationDelayLoadHook.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\windows\PxWindowsIntrinsics.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\include\foundation\Px.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxAllocatorCallback.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxAssert.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxBitAndData.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxBounds3.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxErrorCallback.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxErrors.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxFlags.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxFoundation.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxFoundationVersion.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxIntrinsics.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxIO.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxMat33.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxMat44.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxMath.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxMathUtils.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxMemory.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxPlane.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxPreprocessor.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxProfiler.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxQuat.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxSimpleTypes.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxStrideIterator.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxTransform.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxUnionCast.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxVec2.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxVec3.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxVec4.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\foundation\include\windows\PsWindowsAoS.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\windows\PsWindowsFPU.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\windows\PsWindowsInclude.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\windows\PsWindowsInlineAoS.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\windows\PsWindowsIntrinsics.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\windows\PsWindowsLoadLibrary.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\windows\PsWindowsTrigConstants.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\foundation\include\Ps.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsAlignedMalloc.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsAlloca.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsAllocator.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsAoS.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsArray.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsAtomic.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsBasicTemplates.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsBitUtils.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsBroadcast.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsCpu.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsFoundation.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsFPU.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsHash.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsHashInternals.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsHashMap.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsHashSet.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsInlineAllocator.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsInlineAoS.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsInlineArray.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsIntrinsics.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsMathUtils.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsMutex.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsPool.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsSList.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsSocket.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsSort.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsSortInternals.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsString.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsSync.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsTempAllocator.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsThread.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsTime.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsUserAllocated.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsUtilities.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsVecMath.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsVecMathAoSScalar.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsVecMathAoSScalarInline.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsVecMathSSE.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsVecMathUtilities.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsVecQuat.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsVecTransform.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsAtomic.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsCpu.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsFPU.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsMutex.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsPrintString.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsSList.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsSocket.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsSync.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsThread.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsTime.cpp"></ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\foundation\src\PsAllocator.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\PsAssert.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\PsFoundation.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\PsMathUtils.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\PsString.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\PsTempAllocator.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\PsUtilities.cpp"></ClCompile>
-  </ItemGroup>
-  <ItemGroup></ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets"></ImportGroup>
+<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="release|Win32">
+			<Configuration>release</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="checked|Win32">
+			<Configuration>checked</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="profile|Win32">
+			<Configuration>profile</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+	</ItemGroup>
+	<PropertyGroup Label="Globals">
+		<ProjectGuid>{DF4537B3-3CE9-1581-10B6-A291FE3299C6}</ProjectGuid>
+		<RootNamespace>PxFoundation</RootNamespace>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
+		<ConfigurationType>DynamicLibrary</ConfigurationType>
+		<PlatformToolset>v140</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
+		<ConfigurationType>DynamicLibrary</ConfigurationType>
+		<PlatformToolset>v140</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'" Label="Configuration">
+		<ConfigurationType>DynamicLibrary</ConfigurationType>
+		<PlatformToolset>v140</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'" Label="Configuration">
+		<ConfigurationType>DynamicLibrary</ConfigurationType>
+		<PlatformToolset>v140</PlatformToolset>
+	</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 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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
+		<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)'=='profile|Win32'">
+		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+	</ImportGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
+		<OutDir>./../../../bin/vc14win32\</OutDir>
+		<IntDir>./Win32/PxFoundation/debug\</IntDir>
+		<TargetExt>.dll</TargetExt>
+		<TargetName>PxFoundationDEBUG_x86</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+		<SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
+			<Optimization>Disabled</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;$(WindowsSDK_IncludePath);./../../foundation/include;./../../foundation/include/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>PX_FOUNDATION_DLL=1;WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;_DEBUG;PX_DEBUG=1;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Link>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)PxFoundationDEBUG_x86.dll</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<SubSystem>Console</SubSystem>
+			<ImportLibrary>./../../../lib/vc14win32/$(TargetName).lib</ImportLibrary>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<TargetMachine>MachineX86</TargetMachine>
+		</Link>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
+		<OutDir>./../../../bin/vc14win32\</OutDir>
+		<IntDir>./Win32/PxFoundation/release\</IntDir>
+		<TargetExt>.dll</TargetExt>
+		<TargetName>PxFoundation_x86</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+		<SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;$(WindowsSDK_IncludePath);./../../foundation/include;./../../foundation/include/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>PX_FOUNDATION_DLL=1;WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Link>
+			<AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)PxFoundation_x86.dll</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<SubSystem>Console</SubSystem>
+			<ImportLibrary>./../../../lib/vc14win32/$(TargetName).lib</ImportLibrary>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<TargetMachine>MachineX86</TargetMachine>
+		</Link>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
+		<OutDir>./../../../bin/vc14win32\</OutDir>
+		<IntDir>./Win32/PxFoundation/checked\</IntDir>
+		<TargetExt>.dll</TargetExt>
+		<TargetName>PxFoundationCHECKED_x86</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+		<SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;$(WindowsSDK_IncludePath);./../../foundation/include;./../../foundation/include/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>PX_FOUNDATION_DLL=1;WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Link>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)PxFoundationCHECKED_x86.dll</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<SubSystem>Console</SubSystem>
+			<ImportLibrary>./../../../lib/vc14win32/$(TargetName).lib</ImportLibrary>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<TargetMachine>MachineX86</TargetMachine>
+		</Link>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'">
+		<OutDir>./../../../bin/vc14win32\</OutDir>
+		<IntDir>./Win32/PxFoundation/profile\</IntDir>
+		<TargetExt>.dll</TargetExt>
+		<TargetName>PxFoundationPROFILE_x86</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+		<SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;$(WindowsSDK_IncludePath);./../../foundation/include;./../../foundation/include/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>PX_FOUNDATION_DLL=1;WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_PROFILE=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Link>
+			<AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)PxFoundationPROFILE_x86.dll</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<SubSystem>Console</SubSystem>
+			<ImportLibrary>./../../../lib/vc14win32/$(TargetName).lib</ImportLibrary>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<TargetMachine>MachineX86</TargetMachine>
+		</Link>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<ItemGroup>
+		<ResourceCompile Include="..\resource_x86\PxFoundation.rc">
+		</ResourceCompile>
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\..\include\foundation\windows\PxWindowsFoundationDelayLoadHook.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\windows\PxWindowsIntrinsics.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\..\include\foundation\Px.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxAllocatorCallback.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxAssert.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxBitAndData.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxBounds3.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxErrorCallback.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxErrors.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxFlags.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxFoundation.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxFoundationVersion.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxIntrinsics.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxIO.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxMat33.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxMat44.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxMath.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxMathUtils.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxMemory.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxPlane.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxPreprocessor.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxProfiler.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxQuat.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxSimpleTypes.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxStrideIterator.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxTransform.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxUnionCast.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxVec2.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxVec3.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxVec4.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\foundation\include\windows\PsWindowsAoS.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\windows\PsWindowsFPU.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\windows\PsWindowsInclude.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\windows\PsWindowsInlineAoS.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\windows\PsWindowsIntrinsics.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\windows\PsWindowsLoadLibrary.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\windows\PsWindowsTrigConstants.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\foundation\include\Ps.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsAlignedMalloc.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsAlloca.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsAllocator.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsAoS.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsArray.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsAtomic.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsBasicTemplates.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsBitUtils.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsBroadcast.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsCpu.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsFoundation.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsFPU.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsHash.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsHashInternals.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsHashMap.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsHashSet.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsInlineAllocator.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsInlineAoS.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsInlineArray.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsIntrinsics.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsMathUtils.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsMutex.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsPool.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsSList.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsSocket.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsSort.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsSortInternals.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsString.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsSync.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsTempAllocator.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsThread.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsTime.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsUserAllocated.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsUtilities.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsVecMath.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsVecMathAoSScalar.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsVecMathAoSScalarInline.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsVecMathSSE.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsVecMathUtilities.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsVecQuat.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsVecTransform.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsAtomic.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsCpu.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsFPU.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsMutex.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsPrintString.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsSList.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsSocket.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsSync.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsThread.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsTime.cpp">
+		</ClCompile>
+	</ItemGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\foundation\src\PsAllocator.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\PsAssert.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\PsFoundation.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\PsMathUtils.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\PsString.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\PsTempAllocator.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\PsUtilities.cpp">
+		</ClCompile>
+	</ItemGroup>
+	<ItemGroup>
+	</ItemGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+	<ImportGroup Label="ExtensionTargets"></ImportGroup>
 </Project>
diff --git a/PxShared/src/compiler/vc14win32/PxPvdSDK.vcxproj b/PxShared/src/compiler/vc14win32/PxPvdSDK.vcxproj
index 52629502..b6aec51d 100644
--- a/PxShared/src/compiler/vc14win32/PxPvdSDK.vcxproj
+++ b/PxShared/src/compiler/vc14win32/PxPvdSDK.vcxproj
@@ -1,369 +1,425 @@
 <?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="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="checked|Win32">
-      <Configuration>checked</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="profile|Win32">
-      <Configuration>profile</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{D4255C0E-3C6E-8A94-959C-54BAC884B25C}</ProjectGuid>
-    <RootNamespace>PxPvdSDK</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"
-      Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='release|Win32'"
-      Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='checked|Win32'"
-      Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='profile|Win32'"
-      Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
-  </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
-      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
-      Label="PropertySheets"
-      Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
-    <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)'=='profile|Win32'">
-    <Import
-        Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
-        Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
-        Label="LocalAppDataPlatform"
-    />
-  </ImportGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <OutDir>./../../../bin/vc14win32\</OutDir>
-    <IntDir>./Win32/PxPvdSDK/debug\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>PxPvdSDKDEBUG_x86</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-    <SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../pvd/include;./../../foundation/include;./../../filebuf/include;./../../../../Externals/nvToolsExt/1/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;PX_PVDSDK_DLL=1;PX_FOUNDATION_DLL=1;_DEBUG;PX_DEBUG=1;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>/DELAYLOAD:PxFoundationDEBUG_x86.dll</AdditionalOptions>
-      <AdditionalDependencies>./../../../../Externals/nvToolsExt/1/lib/Win32/nvToolsExt32_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)PxPvdSDKDEBUG_x86.dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <ImportLibrary>./../../../lib/vc14win32/$(TargetName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference></ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <OutDir>./../../../bin/vc14win32\</OutDir>
-    <IntDir>./Win32/PxPvdSDK/release\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>PxPvdSDK_x86</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-    <SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../pvd/include;./../../foundation/include;./../../filebuf/include;./../../../../Externals/nvToolsExt/1/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;PX_PVDSDK_DLL=1;PX_FOUNDATION_DLL=1;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>/INCREMENTAL:NO /DELAYLOAD:PxFoundation_x86.dll</AdditionalOptions>
-      <AdditionalDependencies>./../../../../Externals/nvToolsExt/1/lib/Win32/nvToolsExt32_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)PxPvdSDK_x86.dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <ImportLibrary>./../../../lib/vc14win32/$(TargetName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference></ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
-    <OutDir>./../../../bin/vc14win32\</OutDir>
-    <IntDir>./Win32/PxPvdSDK/checked\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>PxPvdSDKCHECKED_x86</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-    <SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../pvd/include;./../../foundation/include;./../../filebuf/include;./../../../../Externals/nvToolsExt/1/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;PX_PVDSDK_DLL=1;PX_FOUNDATION_DLL=1;NDEBUG;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>/DELAYLOAD:PxFoundationCHECKED_x86.dll</AdditionalOptions>
-      <AdditionalDependencies>./../../../../Externals/nvToolsExt/1/lib/Win32/nvToolsExt32_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)PxPvdSDKCHECKED_x86.dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <ImportLibrary>./../../../lib/vc14win32/$(TargetName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference></ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'">
-    <OutDir>./../../../bin/vc14win32\</OutDir>
-    <IntDir>./Win32/PxPvdSDK/profile\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>PxPvdSDKPROFILE_x86</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-    <SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../pvd/include;./../../foundation/include;./../../filebuf/include;./../../../../Externals/nvToolsExt/1/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;PX_PVDSDK_DLL=1;PX_FOUNDATION_DLL=1;NDEBUG;PX_PROFILE=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>/INCREMENTAL:NO /DELAYLOAD:PxFoundationPROFILE_x86.dll</AdditionalOptions>
-      <AdditionalDependencies>./../../../../Externals/nvToolsExt/1/lib/Win32/nvToolsExt32_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)PxPvdSDKPROFILE_x86.dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <ImportLibrary>./../../../lib/vc14win32/$(TargetName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference></ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\resource_x86\PxPvdSDK.rc"></ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\include\pvd\windows\PxWindowsPvdDelayLoadHook.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\include\pvd\PxPvd.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\pvd\PxPvdTransport.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\pvd\include\PsPvd.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\include\PxProfileAllocatorWrapper.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\include\PxPvdClient.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\include\PxPvdDataStream.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\include\PxPvdDataStreamHelpers.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\include\PxPvdErrorCodes.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\include\PxPvdObjectModelBaseTypes.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\include\PxPvdRenderBuffer.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\include\PxPvdUserRenderer.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\pvd\src\windows\PxWindowsPvdDelayLoadHook.cpp"></ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\pvd\src\PxProfileEventImpl.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvd.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdDataStream.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdDefaultFileTransport.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdDefaultSocketTransport.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdImpl.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdMemClient.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdObjectModelMetaData.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdObjectRegistrar.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdProfileZoneClient.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdUserRenderer.cpp"></ClCompile>
-    <ClInclude Include="..\..\pvd\src\PxProfileBase.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileCompileTimeEventFilter.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileContextProvider.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileContextProviderImpl.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileDataBuffer.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileDataParsing.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventBuffer.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventBufferAtomic.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventBufferClient.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventBufferClientManager.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventFilter.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventHandler.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventId.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventMutex.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventNames.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventParser.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEvents.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventSender.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventSerialization.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventSystem.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemory.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemoryBuffer.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemoryEventBuffer.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemoryEventParser.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemoryEventRecorder.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemoryEventReflexiveWriter.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemoryEvents.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemoryEventSummarizer.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemoryEventTypes.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileScopedEvent.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileScopedMutexLock.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileZone.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileZoneImpl.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileZoneManager.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileZoneManagerImpl.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdBits.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdByteStreams.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdCommStreamEvents.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdCommStreamEventSink.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdCommStreamSDKEventTypes.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdCommStreamTypes.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdDefaultFileTransport.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdDefaultSocketTransport.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdFoundation.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdImpl.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdInternalByteStreams.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdMarshalling.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdMemClient.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdObjectModel.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdObjectModelInternalTypeDefs.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdObjectModelInternalTypes.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdObjectModelMetaData.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdObjectRegistrar.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdProfileZoneClient.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdUserRenderImpl.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdUserRenderTypes.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup></ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="./PxFoundation.vcxproj">
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets"></ImportGroup>
+<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="release|Win32">
+			<Configuration>release</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="checked|Win32">
+			<Configuration>checked</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="profile|Win32">
+			<Configuration>profile</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+	</ItemGroup>
+	<PropertyGroup Label="Globals">
+		<ProjectGuid>{D4255C0E-3C6E-8A94-959C-54BAC884B25C}</ProjectGuid>
+		<RootNamespace>PxPvdSDK</RootNamespace>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
+		<ConfigurationType>DynamicLibrary</ConfigurationType>
+		<PlatformToolset>v140</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
+		<ConfigurationType>DynamicLibrary</ConfigurationType>
+		<PlatformToolset>v140</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'" Label="Configuration">
+		<ConfigurationType>DynamicLibrary</ConfigurationType>
+		<PlatformToolset>v140</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'" Label="Configuration">
+		<ConfigurationType>DynamicLibrary</ConfigurationType>
+		<PlatformToolset>v140</PlatformToolset>
+	</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 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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
+		<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)'=='profile|Win32'">
+		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+	</ImportGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
+		<OutDir>./../../../bin/vc14win32\</OutDir>
+		<IntDir>./Win32/PxPvdSDK/debug\</IntDir>
+		<TargetExt>.dll</TargetExt>
+		<TargetName>PxPvdSDKDEBUG_x86</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+		<SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
+			<Optimization>Disabled</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../pvd/include;./../../foundation/include;./../../filebuf/include;./../../../../Externals/nvToolsExt/1/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;PX_PVDSDK_DLL=1;PX_FOUNDATION_DLL=1;_DEBUG;PX_DEBUG=1;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Link>
+			<AdditionalOptions>/DELAYLOAD:PxFoundationDEBUG_x86.dll</AdditionalOptions>
+			<AdditionalDependencies>./../../../../Externals/nvToolsExt/1/lib/Win32/nvToolsExt32_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)PxPvdSDKDEBUG_x86.dll</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<SubSystem>Console</SubSystem>
+			<ImportLibrary>./../../../lib/vc14win32/$(TargetName).lib</ImportLibrary>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<TargetMachine>MachineX86</TargetMachine>
+		</Link>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
+		<OutDir>./../../../bin/vc14win32\</OutDir>
+		<IntDir>./Win32/PxPvdSDK/release\</IntDir>
+		<TargetExt>.dll</TargetExt>
+		<TargetName>PxPvdSDK_x86</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+		<SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../pvd/include;./../../foundation/include;./../../filebuf/include;./../../../../Externals/nvToolsExt/1/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;PX_PVDSDK_DLL=1;PX_FOUNDATION_DLL=1;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Link>
+			<AdditionalOptions>/INCREMENTAL:NO /DELAYLOAD:PxFoundation_x86.dll</AdditionalOptions>
+			<AdditionalDependencies>./../../../../Externals/nvToolsExt/1/lib/Win32/nvToolsExt32_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)PxPvdSDK_x86.dll</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<SubSystem>Console</SubSystem>
+			<ImportLibrary>./../../../lib/vc14win32/$(TargetName).lib</ImportLibrary>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<TargetMachine>MachineX86</TargetMachine>
+		</Link>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
+		<OutDir>./../../../bin/vc14win32\</OutDir>
+		<IntDir>./Win32/PxPvdSDK/checked\</IntDir>
+		<TargetExt>.dll</TargetExt>
+		<TargetName>PxPvdSDKCHECKED_x86</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+		<SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../pvd/include;./../../foundation/include;./../../filebuf/include;./../../../../Externals/nvToolsExt/1/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;PX_PVDSDK_DLL=1;PX_FOUNDATION_DLL=1;NDEBUG;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Link>
+			<AdditionalOptions>/DELAYLOAD:PxFoundationCHECKED_x86.dll</AdditionalOptions>
+			<AdditionalDependencies>./../../../../Externals/nvToolsExt/1/lib/Win32/nvToolsExt32_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)PxPvdSDKCHECKED_x86.dll</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<SubSystem>Console</SubSystem>
+			<ImportLibrary>./../../../lib/vc14win32/$(TargetName).lib</ImportLibrary>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<TargetMachine>MachineX86</TargetMachine>
+		</Link>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'">
+		<OutDir>./../../../bin/vc14win32\</OutDir>
+		<IntDir>./Win32/PxPvdSDK/profile\</IntDir>
+		<TargetExt>.dll</TargetExt>
+		<TargetName>PxPvdSDKPROFILE_x86</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+		<SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../pvd/include;./../../foundation/include;./../../filebuf/include;./../../../../Externals/nvToolsExt/1/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;PX_PVDSDK_DLL=1;PX_FOUNDATION_DLL=1;NDEBUG;PX_PROFILE=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Link>
+			<AdditionalOptions>/INCREMENTAL:NO /DELAYLOAD:PxFoundationPROFILE_x86.dll</AdditionalOptions>
+			<AdditionalDependencies>./../../../../Externals/nvToolsExt/1/lib/Win32/nvToolsExt32_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)PxPvdSDKPROFILE_x86.dll</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<SubSystem>Console</SubSystem>
+			<ImportLibrary>./../../../lib/vc14win32/$(TargetName).lib</ImportLibrary>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<TargetMachine>MachineX86</TargetMachine>
+		</Link>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<ItemGroup>
+		<ResourceCompile Include="..\resource_x86\PxPvdSDK.rc">
+		</ResourceCompile>
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\..\include\pvd\windows\PxWindowsPvdDelayLoadHook.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\..\include\pvd\PxPvd.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\pvd\PxPvdTransport.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\pvd\include\PsPvd.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\include\PxProfileAllocatorWrapper.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\include\PxPvdClient.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\include\PxPvdDataStream.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\include\PxPvdDataStreamHelpers.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\include\PxPvdErrorCodes.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\include\PxPvdObjectModelBaseTypes.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\include\PxPvdRenderBuffer.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\include\PxPvdUserRenderer.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\pvd\src\windows\PxWindowsPvdDelayLoadHook.cpp">
+		</ClCompile>
+	</ItemGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\pvd\src\PxProfileEventImpl.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvd.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdDataStream.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdDefaultFileTransport.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdDefaultSocketTransport.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdImpl.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdMemClient.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdObjectModelMetaData.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdObjectRegistrar.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdProfileZoneClient.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdUserRenderer.cpp">
+		</ClCompile>
+		<ClInclude Include="..\..\pvd\src\PxProfileBase.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileCompileTimeEventFilter.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileContextProvider.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileContextProviderImpl.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileDataBuffer.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileDataParsing.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventBuffer.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventBufferAtomic.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventBufferClient.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventBufferClientManager.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventFilter.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventHandler.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventId.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventMutex.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventNames.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventParser.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEvents.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventSender.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventSerialization.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventSystem.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemory.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemoryBuffer.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemoryEventBuffer.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemoryEventParser.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemoryEventRecorder.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemoryEventReflexiveWriter.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemoryEvents.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemoryEventSummarizer.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemoryEventTypes.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileScopedEvent.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileScopedMutexLock.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileZone.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileZoneImpl.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileZoneManager.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileZoneManagerImpl.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdBits.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdByteStreams.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdCommStreamEvents.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdCommStreamEventSink.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdCommStreamSDKEventTypes.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdCommStreamTypes.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdDefaultFileTransport.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdDefaultSocketTransport.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdFoundation.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdImpl.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdInternalByteStreams.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdMarshalling.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdMemClient.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdObjectModel.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdObjectModelInternalTypeDefs.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdObjectModelInternalTypes.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdObjectModelMetaData.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdObjectRegistrar.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdProfileZoneClient.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdUserRenderImpl.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdUserRenderTypes.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+	</ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="./PxFoundation.vcxproj">
+			<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+		</ProjectReference>
+	</ItemGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+	<ImportGroup Label="ExtensionTargets"></ImportGroup>
 </Project>
diff --git a/PxShared/src/compiler/vc14win32/PxTask.vcxproj b/PxShared/src/compiler/vc14win32/PxTask.vcxproj
index 8be5ecdc..31db4a59 100644
--- a/PxShared/src/compiler/vc14win32/PxTask.vcxproj
+++ b/PxShared/src/compiler/vc14win32/PxTask.vcxproj
@@ -1,272 +1,250 @@
 <?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="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="checked|Win32">
-      <Configuration>checked</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="profile|Win32">
-      <Configuration>profile</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{5B1132F6-84F8-142E-B951-ADB8505CC27F}</ProjectGuid>
-    <RootNamespace>PxTask</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"
-      Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='release|Win32'"
-      Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='checked|Win32'"
-      Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='profile|Win32'"
-      Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
-  </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
-      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
-      Label="PropertySheets"
-      Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
-    <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)'=='profile|Win32'">
-    <Import
-        Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
-        Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
-        Label="LocalAppDataPlatform"
-    />
-  </ImportGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <OutDir>./../../../lib/vc14win32\</OutDir>
-    <IntDir>./Win32/PxTask/debug\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>$(ProjectName)DEBUG_x86</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../task/include;./../../foundation/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;_DEBUG;PX_DEBUG=1;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName)DEBUG_x86.lib</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Lib>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <OutDir>./../../../lib/vc14win32\</OutDir>
-    <IntDir>./Win32/PxTask/release\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>$(ProjectName)_x86</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../task/include;./../../foundation/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName)_x86.lib</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Lib>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
-    <OutDir>./../../../lib/vc14win32\</OutDir>
-    <IntDir>./Win32/PxTask/checked\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>$(ProjectName)CHECKED_x86</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../task/include;./../../foundation/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName)CHECKED_x86.lib</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Lib>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'">
-    <OutDir>./../../../lib/vc14win32\</OutDir>
-    <IntDir>./Win32/PxTask/profile\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>$(ProjectName)PROFILE_x86</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../task/include;./../../foundation/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_PROFILE=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName)PROFILE_x86.lib</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Lib>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\include\task\PxCpuDispatcher.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\task\PxGpuDispatcher.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\task\PxGpuTask.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\task\PxTask.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\task\PxTaskDefine.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\task\PxTaskManager.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\task\src\TaskManager.cpp"></ClCompile>
-  </ItemGroup>
-  <ItemGroup></ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets"></ImportGroup>
+<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="release|Win32">
+			<Configuration>release</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="checked|Win32">
+			<Configuration>checked</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="profile|Win32">
+			<Configuration>profile</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+	</ItemGroup>
+	<PropertyGroup Label="Globals">
+		<ProjectGuid>{5B1132F6-84F8-142E-B951-ADB8505CC27F}</ProjectGuid>
+		<RootNamespace>PxTask</RootNamespace>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<PlatformToolset>v140</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<PlatformToolset>v140</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<PlatformToolset>v140</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<PlatformToolset>v140</PlatformToolset>
+	</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 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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
+		<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)'=='profile|Win32'">
+		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+	</ImportGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
+		<OutDir>./../../../lib/vc14win32\</OutDir>
+		<IntDir>./Win32/PxTask/debug\</IntDir>
+		<TargetExt>.lib</TargetExt>
+		<TargetName>$(ProjectName)DEBUG_x86</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
+			<Optimization>Disabled</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../task/include;./../../foundation/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;_DEBUG;PX_DEBUG=1;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Lib>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)$(ProjectName)DEBUG_x86.lib</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<TargetMachine>MachineX86</TargetMachine>
+		</Lib>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+			<LinkLibraryDependencies>true</LinkLibraryDependencies>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
+		<OutDir>./../../../lib/vc14win32\</OutDir>
+		<IntDir>./Win32/PxTask/release\</IntDir>
+		<TargetExt>.lib</TargetExt>
+		<TargetName>$(ProjectName)_x86</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../task/include;./../../foundation/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Lib>
+			<AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)$(ProjectName)_x86.lib</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<TargetMachine>MachineX86</TargetMachine>
+		</Lib>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+			<LinkLibraryDependencies>true</LinkLibraryDependencies>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
+		<OutDir>./../../../lib/vc14win32\</OutDir>
+		<IntDir>./Win32/PxTask/checked\</IntDir>
+		<TargetExt>.lib</TargetExt>
+		<TargetName>$(ProjectName)CHECKED_x86</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../task/include;./../../foundation/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Lib>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)$(ProjectName)CHECKED_x86.lib</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<TargetMachine>MachineX86</TargetMachine>
+		</Lib>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+			<LinkLibraryDependencies>true</LinkLibraryDependencies>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'">
+		<OutDir>./../../../lib/vc14win32\</OutDir>
+		<IntDir>./Win32/PxTask/profile\</IntDir>
+		<TargetExt>.lib</TargetExt>
+		<TargetName>$(ProjectName)PROFILE_x86</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../task/include;./../../foundation/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_PROFILE=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Lib>
+			<AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)$(ProjectName)PROFILE_x86.lib</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<TargetMachine>MachineX86</TargetMachine>
+		</Lib>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+			<LinkLibraryDependencies>true</LinkLibraryDependencies>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\..\include\task\PxCpuDispatcher.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\task\PxGpuDispatcher.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\task\PxGpuTask.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\task\PxTask.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\task\PxTaskDefine.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\task\PxTaskManager.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\task\src\TaskManager.cpp">
+		</ClCompile>
+	</ItemGroup>
+	<ItemGroup>
+	</ItemGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+	<ImportGroup Label="ExtensionTargets"></ImportGroup>
 </Project>
diff --git a/PxShared/src/compiler/vc14win64/PsFastXml.vcxproj b/PxShared/src/compiler/vc14win64/PsFastXml.vcxproj
index 1355c043..b8e99628 100644
--- a/PxShared/src/compiler/vc14win64/PsFastXml.vcxproj
+++ b/PxShared/src/compiler/vc14win64/PsFastXml.vcxproj
@@ -1,262 +1,234 @@
 <?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|x64">
-      <Configuration>debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|x64">
-      <Configuration>release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="checked|x64">
-      <Configuration>checked</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="profile|x64">
-      <Configuration>profile</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{82276A9F-CCF0-C50C-BB4A-82ACFFE2A93A}</ProjectGuid>
-    <RootNamespace>PsFastXml</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='debug|x64'"
-      Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='release|x64'"
-      Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='checked|x64'"
-      Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='profile|x64'"
-      Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings"></ImportGroup>
-  <ImportGroup
-      Label="PropertySheets"
-      Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
-    <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|x64'">
-    <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)'=='checked|x64'">
-    <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)'=='profile|x64'">
-    <Import
-        Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
-        Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
-        Label="LocalAppDataPlatform"
-    />
-  </ImportGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
-    <OutDir>./../../../lib/vc14win64\</OutDir>
-    <IntDir>./x64/PsFastXml/debug\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>$(ProjectName)DEBUG_x64</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../foundation/include;./../../fastxml/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>PX_FOUNDATION_DLL=0;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;_DEBUG;PX_DEBUG=1;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName)DEBUG_x64.lib</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Lib>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
-    <OutDir>./../../../lib/vc14win64\</OutDir>
-    <IntDir>./x64/PsFastXml/release\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>$(ProjectName)_x64</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../foundation/include;./../../fastxml/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>PX_FOUNDATION_DLL=0;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName)_x64.lib</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Lib>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'">
-    <OutDir>./../../../lib/vc14win64\</OutDir>
-    <IntDir>./x64/PsFastXml/checked\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>$(ProjectName)CHECKED_x64</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../foundation/include;./../../fastxml/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>PX_FOUNDATION_DLL=0;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName)CHECKED_x64.lib</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Lib>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'">
-    <OutDir>./../../../lib/vc14win64\</OutDir>
-    <IntDir>./x64/PsFastXml/profile\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>$(ProjectName)PROFILE_x64</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../foundation/include;./../../fastxml/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>PX_FOUNDATION_DLL=0;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_PROFILE=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName)PROFILE_x64.lib</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Lib>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\fastxml\include\PsFastXml.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\fastxml\src\PsFastXml.cpp"></ClCompile>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets"></ImportGroup>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<ItemGroup Label="ProjectConfigurations">
+		<ProjectConfiguration Include="debug|x64">
+			<Configuration>debug</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="release|x64">
+			<Configuration>release</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="checked|x64">
+			<Configuration>checked</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="profile|x64">
+			<Configuration>profile</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+	</ItemGroup>
+	<PropertyGroup Label="Globals">
+		<ProjectGuid>{82276A9F-CCF0-C50C-BB4A-82ACFFE2A93A}</ProjectGuid>
+		<RootNamespace>PsFastXml</RootNamespace>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<PlatformToolset>v140</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<PlatformToolset>v140</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<PlatformToolset>v140</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<PlatformToolset>v140</PlatformToolset>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+	<ImportGroup Label="ExtensionSettings">
+	</ImportGroup>
+	<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
+		<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|x64'">
+		<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)'=='checked|x64'">
+		<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)'=='profile|x64'">
+		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+	</ImportGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
+		<OutDir>./../../../lib/vc14win64\</OutDir>
+		<IntDir>./x64/PsFastXml/debug\</IntDir>
+		<TargetExt>.lib</TargetExt>
+		<TargetName>$(ProjectName)DEBUG_x64</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
+			<Optimization>Disabled</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../foundation/include;./../../fastxml/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>PX_FOUNDATION_DLL=0;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;_DEBUG;PX_DEBUG=1;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Lib>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)$(ProjectName)DEBUG_x64.lib</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<TargetMachine>MachineX64</TargetMachine>
+		</Lib>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+			<LinkLibraryDependencies>true</LinkLibraryDependencies>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
+		<OutDir>./../../../lib/vc14win64\</OutDir>
+		<IntDir>./x64/PsFastXml/release\</IntDir>
+		<TargetExt>.lib</TargetExt>
+		<TargetName>$(ProjectName)_x64</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../foundation/include;./../../fastxml/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>PX_FOUNDATION_DLL=0;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Lib>
+			<AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)$(ProjectName)_x64.lib</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<TargetMachine>MachineX64</TargetMachine>
+		</Lib>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+			<LinkLibraryDependencies>true</LinkLibraryDependencies>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'">
+		<OutDir>./../../../lib/vc14win64\</OutDir>
+		<IntDir>./x64/PsFastXml/checked\</IntDir>
+		<TargetExt>.lib</TargetExt>
+		<TargetName>$(ProjectName)CHECKED_x64</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../foundation/include;./../../fastxml/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>PX_FOUNDATION_DLL=0;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Lib>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)$(ProjectName)CHECKED_x64.lib</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<TargetMachine>MachineX64</TargetMachine>
+		</Lib>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+			<LinkLibraryDependencies>true</LinkLibraryDependencies>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'">
+		<OutDir>./../../../lib/vc14win64\</OutDir>
+		<IntDir>./x64/PsFastXml/profile\</IntDir>
+		<TargetExt>.lib</TargetExt>
+		<TargetName>$(ProjectName)PROFILE_x64</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../foundation/include;./../../fastxml/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>PX_FOUNDATION_DLL=0;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_PROFILE=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Lib>
+			<AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)$(ProjectName)PROFILE_x64.lib</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<TargetMachine>MachineX64</TargetMachine>
+		</Lib>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+			<LinkLibraryDependencies>true</LinkLibraryDependencies>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\fastxml\include\PsFastXml.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\fastxml\src\PsFastXml.cpp">
+		</ClCompile>
+	</ItemGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+	<ImportGroup Label="ExtensionTargets"></ImportGroup>
 </Project>
diff --git a/PxShared/src/compiler/vc14win64/PxFoundation.vcxproj b/PxShared/src/compiler/vc14win64/PxFoundation.vcxproj
index bca1fa27..6ba72231 100644
--- a/PxShared/src/compiler/vc14win64/PxFoundation.vcxproj
+++ b/PxShared/src/compiler/vc14win64/PxFoundation.vcxproj
@@ -1,376 +1,448 @@
 <?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|x64">
-      <Configuration>debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|x64">
-      <Configuration>release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="checked|x64">
-      <Configuration>checked</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="profile|x64">
-      <Configuration>profile</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{DF4537B3-3CE9-1581-10B6-A291FE3299C6}</ProjectGuid>
-    <RootNamespace>PxFoundation</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='debug|x64'"
-      Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='release|x64'"
-      Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='checked|x64'"
-      Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='profile|x64'"
-      Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings"></ImportGroup>
-  <ImportGroup
-      Label="PropertySheets"
-      Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
-    <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|x64'">
-    <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)'=='checked|x64'">
-    <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)'=='profile|x64'">
-    <Import
-        Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
-        Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
-        Label="LocalAppDataPlatform"
-    />
-  </ImportGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
-    <OutDir>./../../../bin/vc14win64\</OutDir>
-    <IntDir>./x64/PxFoundation/debug\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>PxFoundationDEBUG_x64</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-    <SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;$(WindowsSDK_IncludePath);./../../foundation/include;./../../foundation/include/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>PX_FOUNDATION_DLL=1;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;_DEBUG;PX_DEBUG=1;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)PxFoundationDEBUG_x64.dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <ImportLibrary>./../../../lib/vc14win64/$(TargetName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference></ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
-    <OutDir>./../../../bin/vc14win64\</OutDir>
-    <IntDir>./x64/PxFoundation/release\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>PxFoundation_x64</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-    <SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;$(WindowsSDK_IncludePath);./../../foundation/include;./../../foundation/include/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>PX_FOUNDATION_DLL=1;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)PxFoundation_x64.dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <ImportLibrary>./../../../lib/vc14win64/$(TargetName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference></ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'">
-    <OutDir>./../../../bin/vc14win64\</OutDir>
-    <IntDir>./x64/PxFoundation/checked\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>PxFoundationCHECKED_x64</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-    <SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;$(WindowsSDK_IncludePath);./../../foundation/include;./../../foundation/include/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>PX_FOUNDATION_DLL=1;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)PxFoundationCHECKED_x64.dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <ImportLibrary>./../../../lib/vc14win64/$(TargetName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference></ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'">
-    <OutDir>./../../../bin/vc14win64\</OutDir>
-    <IntDir>./x64/PxFoundation/profile\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>PxFoundationPROFILE_x64</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-    <SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;$(WindowsSDK_IncludePath);./../../foundation/include;./../../foundation/include/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>PX_FOUNDATION_DLL=1;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_PROFILE=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)PxFoundationPROFILE_x64.dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <ImportLibrary>./../../../lib/vc14win64/$(TargetName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference></ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\resource_x64\PxFoundation.rc"></ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\include\foundation\windows\PxWindowsFoundationDelayLoadHook.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\windows\PxWindowsIntrinsics.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\include\foundation\Px.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxAllocatorCallback.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxAssert.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxBitAndData.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxBounds3.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxErrorCallback.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxErrors.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxFlags.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxFoundation.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxFoundationVersion.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxIntrinsics.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxIO.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxMat33.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxMat44.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxMath.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxMathUtils.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxMemory.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxPlane.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxPreprocessor.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxProfiler.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxQuat.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxSimpleTypes.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxStrideIterator.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxTransform.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxUnionCast.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxVec2.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxVec3.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxVec4.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\foundation\include\windows\PsWindowsAoS.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\windows\PsWindowsFPU.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\windows\PsWindowsInclude.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\windows\PsWindowsInlineAoS.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\windows\PsWindowsIntrinsics.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\windows\PsWindowsLoadLibrary.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\windows\PsWindowsTrigConstants.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\foundation\include\Ps.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsAlignedMalloc.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsAlloca.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsAllocator.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsAoS.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsArray.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsAtomic.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsBasicTemplates.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsBitUtils.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsBroadcast.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsCpu.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsFoundation.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsFPU.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsHash.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsHashInternals.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsHashMap.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsHashSet.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsInlineAllocator.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsInlineAoS.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsInlineArray.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsIntrinsics.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsMathUtils.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsMutex.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsPool.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsSList.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsSocket.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsSort.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsSortInternals.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsString.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsSync.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsTempAllocator.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsThread.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsTime.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsUserAllocated.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsUtilities.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsVecMath.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsVecMathAoSScalar.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsVecMathAoSScalarInline.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsVecMathSSE.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsVecMathUtilities.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsVecQuat.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsVecTransform.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsAtomic.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsCpu.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsFPU.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsMutex.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsPrintString.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsSList.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsSocket.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsSync.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsThread.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsTime.cpp"></ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\foundation\src\PsAllocator.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\PsAssert.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\PsFoundation.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\PsMathUtils.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\PsString.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\PsTempAllocator.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\PsUtilities.cpp"></ClCompile>
-  </ItemGroup>
-  <ItemGroup></ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets"></ImportGroup>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<ItemGroup Label="ProjectConfigurations">
+		<ProjectConfiguration Include="debug|x64">
+			<Configuration>debug</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="release|x64">
+			<Configuration>release</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="checked|x64">
+			<Configuration>checked</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="profile|x64">
+			<Configuration>profile</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+	</ItemGroup>
+	<PropertyGroup Label="Globals">
+		<ProjectGuid>{DF4537B3-3CE9-1581-10B6-A291FE3299C6}</ProjectGuid>
+		<RootNamespace>PxFoundation</RootNamespace>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'" Label="Configuration">
+		<ConfigurationType>DynamicLibrary</ConfigurationType>
+		<PlatformToolset>v140</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'" Label="Configuration">
+		<ConfigurationType>DynamicLibrary</ConfigurationType>
+		<PlatformToolset>v140</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'" Label="Configuration">
+		<ConfigurationType>DynamicLibrary</ConfigurationType>
+		<PlatformToolset>v140</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'" Label="Configuration">
+		<ConfigurationType>DynamicLibrary</ConfigurationType>
+		<PlatformToolset>v140</PlatformToolset>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+	<ImportGroup Label="ExtensionSettings">
+	</ImportGroup>
+	<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
+		<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|x64'">
+		<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)'=='checked|x64'">
+		<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)'=='profile|x64'">
+		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+	</ImportGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
+		<OutDir>./../../../bin/vc14win64\</OutDir>
+		<IntDir>./x64/PxFoundation/debug\</IntDir>
+		<TargetExt>.dll</TargetExt>
+		<TargetName>PxFoundationDEBUG_x64</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+		<SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
+			<Optimization>Disabled</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;$(WindowsSDK_IncludePath);./../../foundation/include;./../../foundation/include/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>PX_FOUNDATION_DLL=1;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;_DEBUG;PX_DEBUG=1;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Link>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)PxFoundationDEBUG_x64.dll</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<SubSystem>Console</SubSystem>
+			<ImportLibrary>./../../../lib/vc14win64/$(TargetName).lib</ImportLibrary>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<TargetMachine>MachineX64</TargetMachine>
+		</Link>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
+		<OutDir>./../../../bin/vc14win64\</OutDir>
+		<IntDir>./x64/PxFoundation/release\</IntDir>
+		<TargetExt>.dll</TargetExt>
+		<TargetName>PxFoundation_x64</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+		<SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;$(WindowsSDK_IncludePath);./../../foundation/include;./../../foundation/include/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>PX_FOUNDATION_DLL=1;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Link>
+			<AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)PxFoundation_x64.dll</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<SubSystem>Console</SubSystem>
+			<ImportLibrary>./../../../lib/vc14win64/$(TargetName).lib</ImportLibrary>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<TargetMachine>MachineX64</TargetMachine>
+		</Link>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'">
+		<OutDir>./../../../bin/vc14win64\</OutDir>
+		<IntDir>./x64/PxFoundation/checked\</IntDir>
+		<TargetExt>.dll</TargetExt>
+		<TargetName>PxFoundationCHECKED_x64</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+		<SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;$(WindowsSDK_IncludePath);./../../foundation/include;./../../foundation/include/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>PX_FOUNDATION_DLL=1;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Link>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)PxFoundationCHECKED_x64.dll</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<SubSystem>Console</SubSystem>
+			<ImportLibrary>./../../../lib/vc14win64/$(TargetName).lib</ImportLibrary>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<TargetMachine>MachineX64</TargetMachine>
+		</Link>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'">
+		<OutDir>./../../../bin/vc14win64\</OutDir>
+		<IntDir>./x64/PxFoundation/profile\</IntDir>
+		<TargetExt>.dll</TargetExt>
+		<TargetName>PxFoundationPROFILE_x64</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+		<SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;$(WindowsSDK_IncludePath);./../../foundation/include;./../../foundation/include/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>PX_FOUNDATION_DLL=1;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_PROFILE=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Link>
+			<AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)PxFoundationPROFILE_x64.dll</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<SubSystem>Console</SubSystem>
+			<ImportLibrary>./../../../lib/vc14win64/$(TargetName).lib</ImportLibrary>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<TargetMachine>MachineX64</TargetMachine>
+		</Link>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<ItemGroup>
+		<ResourceCompile Include="..\resource_x64\PxFoundation.rc">
+		</ResourceCompile>
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\..\include\foundation\windows\PxWindowsFoundationDelayLoadHook.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\windows\PxWindowsIntrinsics.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\..\include\foundation\Px.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxAllocatorCallback.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxAssert.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxBitAndData.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxBounds3.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxErrorCallback.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxErrors.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxFlags.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxFoundation.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxFoundationVersion.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxIntrinsics.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxIO.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxMat33.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxMat44.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxMath.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxMathUtils.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxMemory.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxPlane.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxPreprocessor.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxProfiler.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxQuat.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxSimpleTypes.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxStrideIterator.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxTransform.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxUnionCast.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxVec2.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxVec3.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxVec4.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\foundation\include\windows\PsWindowsAoS.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\windows\PsWindowsFPU.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\windows\PsWindowsInclude.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\windows\PsWindowsInlineAoS.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\windows\PsWindowsIntrinsics.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\windows\PsWindowsLoadLibrary.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\windows\PsWindowsTrigConstants.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\foundation\include\Ps.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsAlignedMalloc.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsAlloca.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsAllocator.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsAoS.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsArray.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsAtomic.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsBasicTemplates.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsBitUtils.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsBroadcast.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsCpu.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsFoundation.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsFPU.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsHash.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsHashInternals.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsHashMap.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsHashSet.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsInlineAllocator.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsInlineAoS.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsInlineArray.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsIntrinsics.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsMathUtils.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsMutex.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsPool.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsSList.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsSocket.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsSort.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsSortInternals.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsString.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsSync.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsTempAllocator.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsThread.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsTime.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsUserAllocated.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsUtilities.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsVecMath.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsVecMathAoSScalar.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsVecMathAoSScalarInline.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsVecMathSSE.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsVecMathUtilities.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsVecQuat.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsVecTransform.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsAtomic.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsCpu.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsFPU.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsMutex.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsPrintString.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsSList.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsSocket.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsSync.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsThread.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsTime.cpp">
+		</ClCompile>
+	</ItemGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\foundation\src\PsAllocator.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\PsAssert.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\PsFoundation.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\PsMathUtils.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\PsString.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\PsTempAllocator.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\PsUtilities.cpp">
+		</ClCompile>
+	</ItemGroup>
+	<ItemGroup>
+	</ItemGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+	<ImportGroup Label="ExtensionTargets"></ImportGroup>
 </Project>
diff --git a/PxShared/src/compiler/vc14win64/PxPvdSDK.vcxproj b/PxShared/src/compiler/vc14win64/PxPvdSDK.vcxproj
index cbf31a00..44843c4d 100644
--- a/PxShared/src/compiler/vc14win64/PxPvdSDK.vcxproj
+++ b/PxShared/src/compiler/vc14win64/PxPvdSDK.vcxproj
@@ -1,365 +1,421 @@
 <?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|x64">
-      <Configuration>debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|x64">
-      <Configuration>release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="checked|x64">
-      <Configuration>checked</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="profile|x64">
-      <Configuration>profile</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{D4255C0E-3C6E-8A94-959C-54BAC884B25C}</ProjectGuid>
-    <RootNamespace>PxPvdSDK</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='debug|x64'"
-      Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='release|x64'"
-      Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='checked|x64'"
-      Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='profile|x64'"
-      Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings"></ImportGroup>
-  <ImportGroup
-      Label="PropertySheets"
-      Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
-    <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|x64'">
-    <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)'=='checked|x64'">
-    <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)'=='profile|x64'">
-    <Import
-        Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
-        Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
-        Label="LocalAppDataPlatform"
-    />
-  </ImportGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
-    <OutDir>./../../../bin/vc14win64\</OutDir>
-    <IntDir>./x64/PxPvdSDK/debug\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>PxPvdSDKDEBUG_x64</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-    <SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../pvd/include;./../../foundation/include;./../../filebuf/include;./../../../../Externals/nvToolsExt/1/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;PX_PVDSDK_DLL=1;PX_FOUNDATION_DLL=1;_DEBUG;PX_DEBUG=1;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>/DELAYLOAD:PxFoundationDEBUG_x64.dll</AdditionalOptions>
-      <AdditionalDependencies>./../../../../Externals/nvToolsExt/1/lib/x64/nvToolsExt64_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)PxPvdSDKDEBUG_x64.dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <ImportLibrary>./../../../lib/vc14win64/$(TargetName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference></ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
-    <OutDir>./../../../bin/vc14win64\</OutDir>
-    <IntDir>./x64/PxPvdSDK/release\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>PxPvdSDK_x64</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-    <SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../pvd/include;./../../foundation/include;./../../filebuf/include;./../../../../Externals/nvToolsExt/1/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;PX_PVDSDK_DLL=1;PX_FOUNDATION_DLL=1;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>/INCREMENTAL:NO /DELAYLOAD:PxFoundation_x64.dll</AdditionalOptions>
-      <AdditionalDependencies>./../../../../Externals/nvToolsExt/1/lib/x64/nvToolsExt64_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)PxPvdSDK_x64.dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <ImportLibrary>./../../../lib/vc14win64/$(TargetName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference></ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'">
-    <OutDir>./../../../bin/vc14win64\</OutDir>
-    <IntDir>./x64/PxPvdSDK/checked\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>PxPvdSDKCHECKED_x64</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-    <SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../pvd/include;./../../foundation/include;./../../filebuf/include;./../../../../Externals/nvToolsExt/1/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;PX_PVDSDK_DLL=1;PX_FOUNDATION_DLL=1;NDEBUG;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>/DELAYLOAD:PxFoundationCHECKED_x64.dll</AdditionalOptions>
-      <AdditionalDependencies>./../../../../Externals/nvToolsExt/1/lib/x64/nvToolsExt64_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)PxPvdSDKCHECKED_x64.dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <ImportLibrary>./../../../lib/vc14win64/$(TargetName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference></ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'">
-    <OutDir>./../../../bin/vc14win64\</OutDir>
-    <IntDir>./x64/PxPvdSDK/profile\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>PxPvdSDKPROFILE_x64</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-    <SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../pvd/include;./../../foundation/include;./../../filebuf/include;./../../../../Externals/nvToolsExt/1/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;PX_PVDSDK_DLL=1;PX_FOUNDATION_DLL=1;NDEBUG;PX_PROFILE=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>/INCREMENTAL:NO /DELAYLOAD:PxFoundationPROFILE_x64.dll</AdditionalOptions>
-      <AdditionalDependencies>./../../../../Externals/nvToolsExt/1/lib/x64/nvToolsExt64_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)PxPvdSDKPROFILE_x64.dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <ImportLibrary>./../../../lib/vc14win64/$(TargetName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference></ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\resource_x64\PxPvdSDK.rc"></ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\include\pvd\windows\PxWindowsPvdDelayLoadHook.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\include\pvd\PxPvd.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\pvd\PxPvdTransport.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\pvd\include\PsPvd.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\include\PxProfileAllocatorWrapper.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\include\PxPvdClient.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\include\PxPvdDataStream.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\include\PxPvdDataStreamHelpers.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\include\PxPvdErrorCodes.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\include\PxPvdObjectModelBaseTypes.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\include\PxPvdRenderBuffer.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\include\PxPvdUserRenderer.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\pvd\src\windows\PxWindowsPvdDelayLoadHook.cpp"></ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\pvd\src\PxProfileEventImpl.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvd.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdDataStream.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdDefaultFileTransport.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdDefaultSocketTransport.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdImpl.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdMemClient.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdObjectModelMetaData.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdObjectRegistrar.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdProfileZoneClient.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdUserRenderer.cpp"></ClCompile>
-    <ClInclude Include="..\..\pvd\src\PxProfileBase.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileCompileTimeEventFilter.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileContextProvider.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileContextProviderImpl.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileDataBuffer.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileDataParsing.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventBuffer.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventBufferAtomic.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventBufferClient.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventBufferClientManager.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventFilter.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventHandler.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventId.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventMutex.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventNames.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventParser.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEvents.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventSender.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventSerialization.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventSystem.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemory.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemoryBuffer.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemoryEventBuffer.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemoryEventParser.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemoryEventRecorder.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemoryEventReflexiveWriter.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemoryEvents.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemoryEventSummarizer.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemoryEventTypes.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileScopedEvent.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileScopedMutexLock.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileZone.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileZoneImpl.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileZoneManager.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileZoneManagerImpl.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdBits.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdByteStreams.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdCommStreamEvents.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdCommStreamEventSink.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdCommStreamSDKEventTypes.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdCommStreamTypes.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdDefaultFileTransport.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdDefaultSocketTransport.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdFoundation.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdImpl.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdInternalByteStreams.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdMarshalling.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdMemClient.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdObjectModel.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdObjectModelInternalTypeDefs.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdObjectModelInternalTypes.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdObjectModelMetaData.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdObjectRegistrar.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdProfileZoneClient.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdUserRenderImpl.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdUserRenderTypes.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup></ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="./PxFoundation.vcxproj">
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets"></ImportGroup>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<ItemGroup Label="ProjectConfigurations">
+		<ProjectConfiguration Include="debug|x64">
+			<Configuration>debug</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="release|x64">
+			<Configuration>release</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="checked|x64">
+			<Configuration>checked</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="profile|x64">
+			<Configuration>profile</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+	</ItemGroup>
+	<PropertyGroup Label="Globals">
+		<ProjectGuid>{D4255C0E-3C6E-8A94-959C-54BAC884B25C}</ProjectGuid>
+		<RootNamespace>PxPvdSDK</RootNamespace>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'" Label="Configuration">
+		<ConfigurationType>DynamicLibrary</ConfigurationType>
+		<PlatformToolset>v140</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'" Label="Configuration">
+		<ConfigurationType>DynamicLibrary</ConfigurationType>
+		<PlatformToolset>v140</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'" Label="Configuration">
+		<ConfigurationType>DynamicLibrary</ConfigurationType>
+		<PlatformToolset>v140</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'" Label="Configuration">
+		<ConfigurationType>DynamicLibrary</ConfigurationType>
+		<PlatformToolset>v140</PlatformToolset>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+	<ImportGroup Label="ExtensionSettings">
+	</ImportGroup>
+	<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
+		<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|x64'">
+		<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)'=='checked|x64'">
+		<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)'=='profile|x64'">
+		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+	</ImportGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
+		<OutDir>./../../../bin/vc14win64\</OutDir>
+		<IntDir>./x64/PxPvdSDK/debug\</IntDir>
+		<TargetExt>.dll</TargetExt>
+		<TargetName>PxPvdSDKDEBUG_x64</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+		<SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
+			<Optimization>Disabled</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../pvd/include;./../../foundation/include;./../../filebuf/include;./../../../../Externals/nvToolsExt/1/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;PX_PVDSDK_DLL=1;PX_FOUNDATION_DLL=1;_DEBUG;PX_DEBUG=1;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Link>
+			<AdditionalOptions>/DELAYLOAD:PxFoundationDEBUG_x64.dll</AdditionalOptions>
+			<AdditionalDependencies>./../../../../Externals/nvToolsExt/1/lib/x64/nvToolsExt64_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)PxPvdSDKDEBUG_x64.dll</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<SubSystem>Console</SubSystem>
+			<ImportLibrary>./../../../lib/vc14win64/$(TargetName).lib</ImportLibrary>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<TargetMachine>MachineX64</TargetMachine>
+		</Link>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
+		<OutDir>./../../../bin/vc14win64\</OutDir>
+		<IntDir>./x64/PxPvdSDK/release\</IntDir>
+		<TargetExt>.dll</TargetExt>
+		<TargetName>PxPvdSDK_x64</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+		<SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../pvd/include;./../../foundation/include;./../../filebuf/include;./../../../../Externals/nvToolsExt/1/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;PX_PVDSDK_DLL=1;PX_FOUNDATION_DLL=1;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Link>
+			<AdditionalOptions>/INCREMENTAL:NO /DELAYLOAD:PxFoundation_x64.dll</AdditionalOptions>
+			<AdditionalDependencies>./../../../../Externals/nvToolsExt/1/lib/x64/nvToolsExt64_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)PxPvdSDK_x64.dll</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<SubSystem>Console</SubSystem>
+			<ImportLibrary>./../../../lib/vc14win64/$(TargetName).lib</ImportLibrary>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<TargetMachine>MachineX64</TargetMachine>
+		</Link>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'">
+		<OutDir>./../../../bin/vc14win64\</OutDir>
+		<IntDir>./x64/PxPvdSDK/checked\</IntDir>
+		<TargetExt>.dll</TargetExt>
+		<TargetName>PxPvdSDKCHECKED_x64</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+		<SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../pvd/include;./../../foundation/include;./../../filebuf/include;./../../../../Externals/nvToolsExt/1/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;PX_PVDSDK_DLL=1;PX_FOUNDATION_DLL=1;NDEBUG;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Link>
+			<AdditionalOptions>/DELAYLOAD:PxFoundationCHECKED_x64.dll</AdditionalOptions>
+			<AdditionalDependencies>./../../../../Externals/nvToolsExt/1/lib/x64/nvToolsExt64_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)PxPvdSDKCHECKED_x64.dll</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<SubSystem>Console</SubSystem>
+			<ImportLibrary>./../../../lib/vc14win64/$(TargetName).lib</ImportLibrary>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<TargetMachine>MachineX64</TargetMachine>
+		</Link>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'">
+		<OutDir>./../../../bin/vc14win64\</OutDir>
+		<IntDir>./x64/PxPvdSDK/profile\</IntDir>
+		<TargetExt>.dll</TargetExt>
+		<TargetName>PxPvdSDKPROFILE_x64</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+		<SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../pvd/include;./../../foundation/include;./../../filebuf/include;./../../../../Externals/nvToolsExt/1/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;PX_PVDSDK_DLL=1;PX_FOUNDATION_DLL=1;NDEBUG;PX_PROFILE=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Link>
+			<AdditionalOptions>/INCREMENTAL:NO /DELAYLOAD:PxFoundationPROFILE_x64.dll</AdditionalOptions>
+			<AdditionalDependencies>./../../../../Externals/nvToolsExt/1/lib/x64/nvToolsExt64_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)PxPvdSDKPROFILE_x64.dll</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<SubSystem>Console</SubSystem>
+			<ImportLibrary>./../../../lib/vc14win64/$(TargetName).lib</ImportLibrary>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<TargetMachine>MachineX64</TargetMachine>
+		</Link>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<ItemGroup>
+		<ResourceCompile Include="..\resource_x64\PxPvdSDK.rc">
+		</ResourceCompile>
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\..\include\pvd\windows\PxWindowsPvdDelayLoadHook.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\..\include\pvd\PxPvd.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\pvd\PxPvdTransport.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\pvd\include\PsPvd.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\include\PxProfileAllocatorWrapper.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\include\PxPvdClient.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\include\PxPvdDataStream.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\include\PxPvdDataStreamHelpers.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\include\PxPvdErrorCodes.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\include\PxPvdObjectModelBaseTypes.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\include\PxPvdRenderBuffer.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\include\PxPvdUserRenderer.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\pvd\src\windows\PxWindowsPvdDelayLoadHook.cpp">
+		</ClCompile>
+	</ItemGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\pvd\src\PxProfileEventImpl.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvd.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdDataStream.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdDefaultFileTransport.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdDefaultSocketTransport.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdImpl.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdMemClient.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdObjectModelMetaData.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdObjectRegistrar.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdProfileZoneClient.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdUserRenderer.cpp">
+		</ClCompile>
+		<ClInclude Include="..\..\pvd\src\PxProfileBase.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileCompileTimeEventFilter.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileContextProvider.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileContextProviderImpl.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileDataBuffer.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileDataParsing.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventBuffer.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventBufferAtomic.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventBufferClient.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventBufferClientManager.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventFilter.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventHandler.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventId.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventMutex.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventNames.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventParser.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEvents.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventSender.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventSerialization.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventSystem.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemory.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemoryBuffer.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemoryEventBuffer.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemoryEventParser.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemoryEventRecorder.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemoryEventReflexiveWriter.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemoryEvents.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemoryEventSummarizer.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemoryEventTypes.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileScopedEvent.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileScopedMutexLock.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileZone.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileZoneImpl.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileZoneManager.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileZoneManagerImpl.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdBits.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdByteStreams.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdCommStreamEvents.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdCommStreamEventSink.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdCommStreamSDKEventTypes.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdCommStreamTypes.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdDefaultFileTransport.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdDefaultSocketTransport.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdFoundation.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdImpl.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdInternalByteStreams.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdMarshalling.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdMemClient.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdObjectModel.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdObjectModelInternalTypeDefs.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdObjectModelInternalTypes.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdObjectModelMetaData.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdObjectRegistrar.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdProfileZoneClient.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdUserRenderImpl.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdUserRenderTypes.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+	</ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="./PxFoundation.vcxproj">
+			<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+		</ProjectReference>
+	</ItemGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+	<ImportGroup Label="ExtensionTargets"></ImportGroup>
 </Project>
diff --git a/PxShared/src/compiler/vc14win64/PxTask.vcxproj b/PxShared/src/compiler/vc14win64/PxTask.vcxproj
index 241f533b..2aee2ead 100644
--- a/PxShared/src/compiler/vc14win64/PxTask.vcxproj
+++ b/PxShared/src/compiler/vc14win64/PxTask.vcxproj
@@ -1,268 +1,246 @@
 <?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|x64">
-      <Configuration>debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|x64">
-      <Configuration>release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="checked|x64">
-      <Configuration>checked</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="profile|x64">
-      <Configuration>profile</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{5B1132F6-84F8-142E-B951-ADB8505CC27F}</ProjectGuid>
-    <RootNamespace>PxTask</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='debug|x64'"
-      Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='release|x64'"
-      Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='checked|x64'"
-      Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='profile|x64'"
-      Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings"></ImportGroup>
-  <ImportGroup
-      Label="PropertySheets"
-      Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
-    <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|x64'">
-    <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)'=='checked|x64'">
-    <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)'=='profile|x64'">
-    <Import
-        Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
-        Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
-        Label="LocalAppDataPlatform"
-    />
-  </ImportGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
-    <OutDir>./../../../lib/vc14win64\</OutDir>
-    <IntDir>./x64/PxTask/debug\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>$(ProjectName)DEBUG_x64</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../task/include;./../../foundation/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;_DEBUG;PX_DEBUG=1;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName)DEBUG_x64.lib</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Lib>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
-    <OutDir>./../../../lib/vc14win64\</OutDir>
-    <IntDir>./x64/PxTask/release\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>$(ProjectName)_x64</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../task/include;./../../foundation/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName)_x64.lib</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Lib>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'">
-    <OutDir>./../../../lib/vc14win64\</OutDir>
-    <IntDir>./x64/PxTask/checked\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>$(ProjectName)CHECKED_x64</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../task/include;./../../foundation/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName)CHECKED_x64.lib</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Lib>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'">
-    <OutDir>./../../../lib/vc14win64\</OutDir>
-    <IntDir>./x64/PxTask/profile\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>$(ProjectName)PROFILE_x64</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <StringPooling>true</StringPooling>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../task/include;./../../foundation/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_PROFILE=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName)PROFILE_x64.lib</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Lib>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\include\task\PxCpuDispatcher.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\task\PxGpuDispatcher.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\task\PxGpuTask.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\task\PxTask.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\task\PxTaskDefine.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\task\PxTaskManager.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\task\src\TaskManager.cpp"></ClCompile>
-  </ItemGroup>
-  <ItemGroup></ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets"></ImportGroup>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<ItemGroup Label="ProjectConfigurations">
+		<ProjectConfiguration Include="debug|x64">
+			<Configuration>debug</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="release|x64">
+			<Configuration>release</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="checked|x64">
+			<Configuration>checked</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="profile|x64">
+			<Configuration>profile</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+	</ItemGroup>
+	<PropertyGroup Label="Globals">
+		<ProjectGuid>{5B1132F6-84F8-142E-B951-ADB8505CC27F}</ProjectGuid>
+		<RootNamespace>PxTask</RootNamespace>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<PlatformToolset>v140</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<PlatformToolset>v140</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<PlatformToolset>v140</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<PlatformToolset>v140</PlatformToolset>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+	<ImportGroup Label="ExtensionSettings">
+	</ImportGroup>
+	<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
+		<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|x64'">
+		<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)'=='checked|x64'">
+		<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)'=='profile|x64'">
+		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+	</ImportGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
+		<OutDir>./../../../lib/vc14win64\</OutDir>
+		<IntDir>./x64/PxTask/debug\</IntDir>
+		<TargetExt>.lib</TargetExt>
+		<TargetName>$(ProjectName)DEBUG_x64</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
+			<Optimization>Disabled</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../task/include;./../../foundation/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;_DEBUG;PX_DEBUG=1;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Lib>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)$(ProjectName)DEBUG_x64.lib</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<TargetMachine>MachineX64</TargetMachine>
+		</Lib>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+			<LinkLibraryDependencies>true</LinkLibraryDependencies>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
+		<OutDir>./../../../lib/vc14win64\</OutDir>
+		<IntDir>./x64/PxTask/release\</IntDir>
+		<TargetExt>.lib</TargetExt>
+		<TargetName>$(ProjectName)_x64</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../task/include;./../../foundation/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Lib>
+			<AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)$(ProjectName)_x64.lib</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<TargetMachine>MachineX64</TargetMachine>
+		</Lib>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+			<LinkLibraryDependencies>true</LinkLibraryDependencies>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'">
+		<OutDir>./../../../lib/vc14win64\</OutDir>
+		<IntDir>./x64/PxTask/checked\</IntDir>
+		<TargetExt>.lib</TargetExt>
+		<TargetName>$(ProjectName)CHECKED_x64</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../task/include;./../../foundation/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Lib>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)$(ProjectName)CHECKED_x64.lib</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<TargetMachine>MachineX64</TargetMachine>
+		</Lib>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+			<LinkLibraryDependencies>true</LinkLibraryDependencies>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'">
+		<OutDir>./../../../lib/vc14win64\</OutDir>
+		<IntDir>./x64/PxTask/profile\</IntDir>
+		<TargetExt>.lib</TargetExt>
+		<TargetName>$(ProjectName)PROFILE_x64</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<StringPooling>true</StringPooling>
+			<RuntimeTypeInfo>false</RuntimeTypeInfo>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../task/include;./../../foundation/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_PROFILE=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Lib>
+			<AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)$(ProjectName)PROFILE_x64.lib</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<TargetMachine>MachineX64</TargetMachine>
+		</Lib>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+			<LinkLibraryDependencies>true</LinkLibraryDependencies>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\..\include\task\PxCpuDispatcher.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\task\PxGpuDispatcher.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\task\PxGpuTask.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\task\PxTask.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\task\PxTaskDefine.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\task\PxTaskManager.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\task\src\TaskManager.cpp">
+		</ClCompile>
+	</ItemGroup>
+	<ItemGroup>
+	</ItemGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+	<ImportGroup Label="ExtensionTargets"></ImportGroup>
 </Project>
diff --git a/PxShared/src/compiler/vc15win32/PsFastXml.vcxproj b/PxShared/src/compiler/vc15win32/PsFastXml.vcxproj
index 624a5fef..aeddfe07 100644
--- a/PxShared/src/compiler/vc15win32/PsFastXml.vcxproj
+++ b/PxShared/src/compiler/vc15win32/PsFastXml.vcxproj
@@ -1,254 +1,226 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project
-    DefaultTargets="Build"
-    ToolsVersion="15.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="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="checked|Win32">
-      <Configuration>checked</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="profile|Win32">
-      <Configuration>profile</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{82276A9F-CCF0-C50C-BB4A-82ACFFE2A93A}</ProjectGuid>
-    <RootNamespace>PsFastXml</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"
-      Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='release|Win32'"
-      Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='checked|Win32'"
-      Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='profile|Win32'"
-      Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-  </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
-      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
-      Label="PropertySheets"
-      Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
-    <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)'=='profile|Win32'">
-    <Import
-        Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
-        Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
-        Label="LocalAppDataPlatform"
-    />
-  </ImportGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <OutDir>./../../../lib/vc15win32\</OutDir>
-    <IntDir>./Win32/PsFastXml/debug\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>$(ProjectName)DEBUG_x86</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
-      <AdditionalOptions>/GR- /GF /arch:SSE2 /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /Zi /d2Zi+</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../foundation/include;./../../fastxml/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>PX_FOUNDATION_DLL=0;WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;_DEBUG;PX_DEBUG=1;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName)DEBUG_x86.lib</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Lib>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <OutDir>./../../../lib/vc15win32\</OutDir>
-    <IntDir>./Win32/PsFastXml/release\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>$(ProjectName)_x86</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/GR- /GF /arch:SSE2 /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../foundation/include;./../../fastxml/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>PX_FOUNDATION_DLL=0;WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName)_x86.lib</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Lib>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
-    <OutDir>./../../../lib/vc15win32\</OutDir>
-    <IntDir>./Win32/PsFastXml/checked\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>$(ProjectName)CHECKED_x86</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/GR- /GF /arch:SSE2 /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../foundation/include;./../../fastxml/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>PX_FOUNDATION_DLL=0;WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName)CHECKED_x86.lib</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Lib>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'">
-    <OutDir>./../../../lib/vc15win32\</OutDir>
-    <IntDir>./Win32/PsFastXml/profile\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>$(ProjectName)PROFILE_x86</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/GR- /GF /arch:SSE2 /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../foundation/include;./../../fastxml/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>PX_FOUNDATION_DLL=0;WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_PROFILE=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName)PROFILE_x86.lib</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Lib>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\fastxml\include\PsFastXml.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\fastxml\src\PsFastXml.cpp"></ClCompile>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets"></ImportGroup>
+<Project DefaultTargets="Build" ToolsVersion="15.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="release|Win32">
+			<Configuration>release</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="checked|Win32">
+			<Configuration>checked</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="profile|Win32">
+			<Configuration>profile</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+	</ItemGroup>
+	<PropertyGroup Label="Globals">
+		<ProjectGuid>{82276A9F-CCF0-C50C-BB4A-82ACFFE2A93A}</ProjectGuid>
+		<RootNamespace>PsFastXml</RootNamespace>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<PlatformToolset>v141</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<PlatformToolset>v141</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<PlatformToolset>v141</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<PlatformToolset>v141</PlatformToolset>
+	</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 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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
+		<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)'=='profile|Win32'">
+		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+	</ImportGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
+		<OutDir>./../../../lib/vc15win32\</OutDir>
+		<IntDir>./Win32/PsFastXml/debug\</IntDir>
+		<TargetExt>.lib</TargetExt>
+		<TargetName>$(ProjectName)DEBUG_x86</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
+			<AdditionalOptions>/GR- /GF /arch:SSE2 /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /Zi /d2Zi+</AdditionalOptions>
+			<Optimization>Disabled</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../foundation/include;./../../fastxml/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>PX_FOUNDATION_DLL=0;WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;_DEBUG;PX_DEBUG=1;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Lib>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)$(ProjectName)DEBUG_x86.lib</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<TargetMachine>MachineX86</TargetMachine>
+		</Lib>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+			<LinkLibraryDependencies>true</LinkLibraryDependencies>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
+		<OutDir>./../../../lib/vc15win32\</OutDir>
+		<IntDir>./Win32/PsFastXml/release\</IntDir>
+		<TargetExt>.lib</TargetExt>
+		<TargetName>$(ProjectName)_x86</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/GR- /GF /arch:SSE2 /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../foundation/include;./../../fastxml/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>PX_FOUNDATION_DLL=0;WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Lib>
+			<AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)$(ProjectName)_x86.lib</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<TargetMachine>MachineX86</TargetMachine>
+		</Lib>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+			<LinkLibraryDependencies>true</LinkLibraryDependencies>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
+		<OutDir>./../../../lib/vc15win32\</OutDir>
+		<IntDir>./Win32/PsFastXml/checked\</IntDir>
+		<TargetExt>.lib</TargetExt>
+		<TargetName>$(ProjectName)CHECKED_x86</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/GR- /GF /arch:SSE2 /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../foundation/include;./../../fastxml/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>PX_FOUNDATION_DLL=0;WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Lib>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)$(ProjectName)CHECKED_x86.lib</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<TargetMachine>MachineX86</TargetMachine>
+		</Lib>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+			<LinkLibraryDependencies>true</LinkLibraryDependencies>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'">
+		<OutDir>./../../../lib/vc15win32\</OutDir>
+		<IntDir>./Win32/PsFastXml/profile\</IntDir>
+		<TargetExt>.lib</TargetExt>
+		<TargetName>$(ProjectName)PROFILE_x86</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/GR- /GF /arch:SSE2 /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../foundation/include;./../../fastxml/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>PX_FOUNDATION_DLL=0;WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_PROFILE=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Lib>
+			<AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)$(ProjectName)PROFILE_x86.lib</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<TargetMachine>MachineX86</TargetMachine>
+		</Lib>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+			<LinkLibraryDependencies>true</LinkLibraryDependencies>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\fastxml\include\PsFastXml.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\fastxml\src\PsFastXml.cpp">
+		</ClCompile>
+	</ItemGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+	<ImportGroup Label="ExtensionTargets"></ImportGroup>
 </Project>
diff --git a/PxShared/src/compiler/vc15win32/PxFoundation.vcxproj b/PxShared/src/compiler/vc15win32/PxFoundation.vcxproj
index e5b1f1b0..38eedd79 100644
--- a/PxShared/src/compiler/vc15win32/PxFoundation.vcxproj
+++ b/PxShared/src/compiler/vc15win32/PxFoundation.vcxproj
@@ -1,368 +1,440 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project
-    DefaultTargets="Build"
-    ToolsVersion="15.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="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="checked|Win32">
-      <Configuration>checked</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="profile|Win32">
-      <Configuration>profile</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{DF4537B3-3CE9-1581-10B6-A291FE3299C6}</ProjectGuid>
-    <RootNamespace>PxFoundation</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"
-      Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='release|Win32'"
-      Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='checked|Win32'"
-      Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='profile|Win32'"
-      Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-  </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
-      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
-      Label="PropertySheets"
-      Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
-    <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)'=='profile|Win32'">
-    <Import
-        Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
-        Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
-        Label="LocalAppDataPlatform"
-    />
-  </ImportGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <OutDir>./../../../bin/vc15win32\</OutDir>
-    <IntDir>./Win32/PxFoundation/debug\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>PxFoundationDEBUG_x86</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-    <SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
-      <AdditionalOptions>/GR- /GF /arch:SSE2 /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /Zi /d2Zi+</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;$(WindowsSDK_IncludePath);./../../foundation/include;./../../foundation/include/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>PX_FOUNDATION_DLL=1;WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;_DEBUG;PX_DEBUG=1;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)PxFoundationDEBUG_x86.dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <ImportLibrary>./../../../lib/vc15win32/$(TargetName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference></ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <OutDir>./../../../bin/vc15win32\</OutDir>
-    <IntDir>./Win32/PxFoundation/release\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>PxFoundation_x86</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-    <SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/GR- /GF /arch:SSE2 /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;$(WindowsSDK_IncludePath);./../../foundation/include;./../../foundation/include/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>PX_FOUNDATION_DLL=1;WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)PxFoundation_x86.dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <ImportLibrary>./../../../lib/vc15win32/$(TargetName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference></ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
-    <OutDir>./../../../bin/vc15win32\</OutDir>
-    <IntDir>./Win32/PxFoundation/checked\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>PxFoundationCHECKED_x86</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-    <SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/GR- /GF /arch:SSE2 /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;$(WindowsSDK_IncludePath);./../../foundation/include;./../../foundation/include/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>PX_FOUNDATION_DLL=1;WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)PxFoundationCHECKED_x86.dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <ImportLibrary>./../../../lib/vc15win32/$(TargetName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference></ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'">
-    <OutDir>./../../../bin/vc15win32\</OutDir>
-    <IntDir>./Win32/PxFoundation/profile\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>PxFoundationPROFILE_x86</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-    <SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/GR- /GF /arch:SSE2 /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;$(WindowsSDK_IncludePath);./../../foundation/include;./../../foundation/include/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>PX_FOUNDATION_DLL=1;WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_PROFILE=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)PxFoundationPROFILE_x86.dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <ImportLibrary>./../../../lib/vc15win32/$(TargetName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference></ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\resource_x86\PxFoundation.rc"></ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\include\foundation\windows\PxWindowsFoundationDelayLoadHook.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\windows\PxWindowsIntrinsics.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\include\foundation\Px.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxAllocatorCallback.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxAssert.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxBitAndData.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxBounds3.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxErrorCallback.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxErrors.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxFlags.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxFoundation.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxFoundationVersion.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxIntrinsics.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxIO.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxMat33.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxMat44.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxMath.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxMathUtils.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxMemory.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxPlane.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxPreprocessor.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxProfiler.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxQuat.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxSimpleTypes.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxStrideIterator.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxTransform.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxUnionCast.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxVec2.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxVec3.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxVec4.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\foundation\include\windows\PsWindowsAoS.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\windows\PsWindowsFPU.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\windows\PsWindowsInclude.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\windows\PsWindowsInlineAoS.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\windows\PsWindowsIntrinsics.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\windows\PsWindowsLoadLibrary.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\windows\PsWindowsTrigConstants.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\foundation\include\Ps.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsAlignedMalloc.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsAlloca.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsAllocator.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsAoS.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsArray.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsAtomic.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsBasicTemplates.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsBitUtils.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsBroadcast.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsCpu.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsFoundation.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsFPU.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsHash.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsHashInternals.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsHashMap.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsHashSet.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsInlineAllocator.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsInlineAoS.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsInlineArray.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsIntrinsics.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsMathUtils.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsMutex.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsPool.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsSList.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsSocket.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsSort.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsSortInternals.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsString.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsSync.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsTempAllocator.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsThread.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsTime.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsUserAllocated.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsUtilities.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsVecMath.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsVecMathAoSScalar.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsVecMathAoSScalarInline.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsVecMathSSE.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsVecMathUtilities.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsVecQuat.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsVecTransform.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsAtomic.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsCpu.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsFPU.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsMutex.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsPrintString.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsSList.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsSocket.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsSync.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsThread.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsTime.cpp"></ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\foundation\src\PsAllocator.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\PsAssert.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\PsFoundation.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\PsMathUtils.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\PsString.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\PsTempAllocator.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\PsUtilities.cpp"></ClCompile>
-  </ItemGroup>
-  <ItemGroup></ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets"></ImportGroup>
+<Project DefaultTargets="Build" ToolsVersion="15.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="release|Win32">
+			<Configuration>release</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="checked|Win32">
+			<Configuration>checked</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="profile|Win32">
+			<Configuration>profile</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+	</ItemGroup>
+	<PropertyGroup Label="Globals">
+		<ProjectGuid>{DF4537B3-3CE9-1581-10B6-A291FE3299C6}</ProjectGuid>
+		<RootNamespace>PxFoundation</RootNamespace>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
+		<ConfigurationType>DynamicLibrary</ConfigurationType>
+		<PlatformToolset>v141</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
+		<ConfigurationType>DynamicLibrary</ConfigurationType>
+		<PlatformToolset>v141</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'" Label="Configuration">
+		<ConfigurationType>DynamicLibrary</ConfigurationType>
+		<PlatformToolset>v141</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'" Label="Configuration">
+		<ConfigurationType>DynamicLibrary</ConfigurationType>
+		<PlatformToolset>v141</PlatformToolset>
+	</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 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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
+		<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)'=='profile|Win32'">
+		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+	</ImportGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
+		<OutDir>./../../../bin/vc15win32\</OutDir>
+		<IntDir>./Win32/PxFoundation/debug\</IntDir>
+		<TargetExt>.dll</TargetExt>
+		<TargetName>PxFoundationDEBUG_x86</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+		<SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
+			<AdditionalOptions>/GR- /GF /arch:SSE2 /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /Zi /d2Zi+</AdditionalOptions>
+			<Optimization>Disabled</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;$(WindowsSDK_IncludePath);./../../foundation/include;./../../foundation/include/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>PX_FOUNDATION_DLL=1;WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;_DEBUG;PX_DEBUG=1;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Link>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)PxFoundationDEBUG_x86.dll</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<SubSystem>Console</SubSystem>
+			<ImportLibrary>./../../../lib/vc15win32/$(TargetName).lib</ImportLibrary>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<TargetMachine>MachineX86</TargetMachine>
+		</Link>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
+		<OutDir>./../../../bin/vc15win32\</OutDir>
+		<IntDir>./Win32/PxFoundation/release\</IntDir>
+		<TargetExt>.dll</TargetExt>
+		<TargetName>PxFoundation_x86</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+		<SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/GR- /GF /arch:SSE2 /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;$(WindowsSDK_IncludePath);./../../foundation/include;./../../foundation/include/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>PX_FOUNDATION_DLL=1;WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Link>
+			<AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)PxFoundation_x86.dll</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<SubSystem>Console</SubSystem>
+			<ImportLibrary>./../../../lib/vc15win32/$(TargetName).lib</ImportLibrary>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<TargetMachine>MachineX86</TargetMachine>
+		</Link>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
+		<OutDir>./../../../bin/vc15win32\</OutDir>
+		<IntDir>./Win32/PxFoundation/checked\</IntDir>
+		<TargetExt>.dll</TargetExt>
+		<TargetName>PxFoundationCHECKED_x86</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+		<SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/GR- /GF /arch:SSE2 /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;$(WindowsSDK_IncludePath);./../../foundation/include;./../../foundation/include/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>PX_FOUNDATION_DLL=1;WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Link>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)PxFoundationCHECKED_x86.dll</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<SubSystem>Console</SubSystem>
+			<ImportLibrary>./../../../lib/vc15win32/$(TargetName).lib</ImportLibrary>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<TargetMachine>MachineX86</TargetMachine>
+		</Link>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'">
+		<OutDir>./../../../bin/vc15win32\</OutDir>
+		<IntDir>./Win32/PxFoundation/profile\</IntDir>
+		<TargetExt>.dll</TargetExt>
+		<TargetName>PxFoundationPROFILE_x86</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+		<SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/GR- /GF /arch:SSE2 /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;$(WindowsSDK_IncludePath);./../../foundation/include;./../../foundation/include/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>PX_FOUNDATION_DLL=1;WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_PROFILE=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Link>
+			<AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)PxFoundationPROFILE_x86.dll</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<SubSystem>Console</SubSystem>
+			<ImportLibrary>./../../../lib/vc15win32/$(TargetName).lib</ImportLibrary>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<TargetMachine>MachineX86</TargetMachine>
+		</Link>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<ItemGroup>
+		<ResourceCompile Include="..\resource_x86\PxFoundation.rc">
+		</ResourceCompile>
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\..\include\foundation\windows\PxWindowsFoundationDelayLoadHook.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\windows\PxWindowsIntrinsics.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\..\include\foundation\Px.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxAllocatorCallback.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxAssert.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxBitAndData.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxBounds3.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxErrorCallback.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxErrors.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxFlags.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxFoundation.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxFoundationVersion.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxIntrinsics.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxIO.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxMat33.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxMat44.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxMath.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxMathUtils.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxMemory.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxPlane.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxPreprocessor.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxProfiler.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxQuat.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxSimpleTypes.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxStrideIterator.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxTransform.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxUnionCast.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxVec2.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxVec3.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxVec4.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\foundation\include\windows\PsWindowsAoS.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\windows\PsWindowsFPU.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\windows\PsWindowsInclude.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\windows\PsWindowsInlineAoS.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\windows\PsWindowsIntrinsics.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\windows\PsWindowsLoadLibrary.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\windows\PsWindowsTrigConstants.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\foundation\include\Ps.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsAlignedMalloc.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsAlloca.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsAllocator.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsAoS.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsArray.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsAtomic.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsBasicTemplates.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsBitUtils.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsBroadcast.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsCpu.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsFoundation.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsFPU.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsHash.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsHashInternals.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsHashMap.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsHashSet.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsInlineAllocator.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsInlineAoS.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsInlineArray.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsIntrinsics.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsMathUtils.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsMutex.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsPool.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsSList.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsSocket.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsSort.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsSortInternals.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsString.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsSync.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsTempAllocator.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsThread.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsTime.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsUserAllocated.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsUtilities.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsVecMath.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsVecMathAoSScalar.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsVecMathAoSScalarInline.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsVecMathSSE.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsVecMathUtilities.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsVecQuat.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsVecTransform.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsAtomic.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsCpu.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsFPU.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsMutex.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsPrintString.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsSList.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsSocket.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsSync.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsThread.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsTime.cpp">
+		</ClCompile>
+	</ItemGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\foundation\src\PsAllocator.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\PsAssert.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\PsFoundation.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\PsMathUtils.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\PsString.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\PsTempAllocator.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\PsUtilities.cpp">
+		</ClCompile>
+	</ItemGroup>
+	<ItemGroup>
+	</ItemGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+	<ImportGroup Label="ExtensionTargets"></ImportGroup>
 </Project>
diff --git a/PxShared/src/compiler/vc15win32/PxPvdSDK.vcxproj b/PxShared/src/compiler/vc15win32/PxPvdSDK.vcxproj
index dfde10f9..fc181764 100644
--- a/PxShared/src/compiler/vc15win32/PxPvdSDK.vcxproj
+++ b/PxShared/src/compiler/vc15win32/PxPvdSDK.vcxproj
@@ -1,357 +1,413 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project
-    DefaultTargets="Build"
-    ToolsVersion="15.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="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="checked|Win32">
-      <Configuration>checked</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="profile|Win32">
-      <Configuration>profile</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{D4255C0E-3C6E-8A94-959C-54BAC884B25C}</ProjectGuid>
-    <RootNamespace>PxPvdSDK</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"
-      Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='release|Win32'"
-      Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='checked|Win32'"
-      Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='profile|Win32'"
-      Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-  </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
-      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
-      Label="PropertySheets"
-      Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
-    <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)'=='profile|Win32'">
-    <Import
-        Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
-        Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
-        Label="LocalAppDataPlatform"
-    />
-  </ImportGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <OutDir>./../../../bin/vc15win32\</OutDir>
-    <IntDir>./Win32/PxPvdSDK/debug\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>PxPvdSDKDEBUG_x86</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-    <SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
-      <AdditionalOptions>/GR- /GF /arch:SSE2 /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /Zi /d2Zi+</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../pvd/include;./../../foundation/include;./../../filebuf/include;./../../../../Externals/nvToolsExt/1/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;PX_PVDSDK_DLL=1;PX_FOUNDATION_DLL=1;_DEBUG;PX_DEBUG=1;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>/DELAYLOAD:PxFoundationDEBUG_x86.dll</AdditionalOptions>
-      <AdditionalDependencies>./../../../../Externals/nvToolsExt/1/lib/Win32/nvToolsExt32_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)PxPvdSDKDEBUG_x86.dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <ImportLibrary>./../../../lib/vc15win32/$(TargetName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference></ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <OutDir>./../../../bin/vc15win32\</OutDir>
-    <IntDir>./Win32/PxPvdSDK/release\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>PxPvdSDK_x86</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-    <SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/GR- /GF /arch:SSE2 /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../pvd/include;./../../foundation/include;./../../filebuf/include;./../../../../Externals/nvToolsExt/1/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;PX_PVDSDK_DLL=1;PX_FOUNDATION_DLL=1;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>/INCREMENTAL:NO /DELAYLOAD:PxFoundation_x86.dll</AdditionalOptions>
-      <AdditionalDependencies>./../../../../Externals/nvToolsExt/1/lib/Win32/nvToolsExt32_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)PxPvdSDK_x86.dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <ImportLibrary>./../../../lib/vc15win32/$(TargetName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference></ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
-    <OutDir>./../../../bin/vc15win32\</OutDir>
-    <IntDir>./Win32/PxPvdSDK/checked\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>PxPvdSDKCHECKED_x86</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-    <SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/GR- /GF /arch:SSE2 /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../pvd/include;./../../foundation/include;./../../filebuf/include;./../../../../Externals/nvToolsExt/1/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;PX_PVDSDK_DLL=1;PX_FOUNDATION_DLL=1;NDEBUG;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>/DELAYLOAD:PxFoundationCHECKED_x86.dll</AdditionalOptions>
-      <AdditionalDependencies>./../../../../Externals/nvToolsExt/1/lib/Win32/nvToolsExt32_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)PxPvdSDKCHECKED_x86.dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <ImportLibrary>./../../../lib/vc15win32/$(TargetName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference></ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'">
-    <OutDir>./../../../bin/vc15win32\</OutDir>
-    <IntDir>./Win32/PxPvdSDK/profile\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>PxPvdSDKPROFILE_x86</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-    <SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/GR- /GF /arch:SSE2 /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../pvd/include;./../../foundation/include;./../../filebuf/include;./../../../../Externals/nvToolsExt/1/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;PX_PVDSDK_DLL=1;PX_FOUNDATION_DLL=1;NDEBUG;PX_PROFILE=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>/INCREMENTAL:NO /DELAYLOAD:PxFoundationPROFILE_x86.dll</AdditionalOptions>
-      <AdditionalDependencies>./../../../../Externals/nvToolsExt/1/lib/Win32/nvToolsExt32_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)PxPvdSDKPROFILE_x86.dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <ImportLibrary>./../../../lib/vc15win32/$(TargetName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference></ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\resource_x86\PxPvdSDK.rc"></ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\include\pvd\windows\PxWindowsPvdDelayLoadHook.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\include\pvd\PxPvd.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\pvd\PxPvdTransport.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\pvd\include\PsPvd.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\include\PxProfileAllocatorWrapper.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\include\PxPvdClient.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\include\PxPvdDataStream.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\include\PxPvdDataStreamHelpers.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\include\PxPvdErrorCodes.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\include\PxPvdObjectModelBaseTypes.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\include\PxPvdRenderBuffer.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\include\PxPvdUserRenderer.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\pvd\src\windows\PxWindowsPvdDelayLoadHook.cpp"></ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\pvd\src\PxProfileEventImpl.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvd.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdDataStream.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdDefaultFileTransport.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdDefaultSocketTransport.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdImpl.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdMemClient.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdObjectModelMetaData.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdObjectRegistrar.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdProfileZoneClient.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdUserRenderer.cpp"></ClCompile>
-    <ClInclude Include="..\..\pvd\src\PxProfileBase.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileCompileTimeEventFilter.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileContextProvider.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileContextProviderImpl.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileDataBuffer.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileDataParsing.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventBuffer.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventBufferAtomic.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventBufferClient.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventBufferClientManager.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventFilter.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventHandler.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventId.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventMutex.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventNames.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventParser.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEvents.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventSender.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventSerialization.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventSystem.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemory.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemoryBuffer.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemoryEventBuffer.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemoryEventParser.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemoryEventRecorder.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemoryEventReflexiveWriter.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemoryEvents.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemoryEventSummarizer.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemoryEventTypes.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileScopedEvent.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileScopedMutexLock.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileZone.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileZoneImpl.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileZoneManager.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileZoneManagerImpl.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdBits.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdByteStreams.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdCommStreamEvents.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdCommStreamEventSink.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdCommStreamSDKEventTypes.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdCommStreamTypes.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdDefaultFileTransport.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdDefaultSocketTransport.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdFoundation.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdImpl.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdInternalByteStreams.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdMarshalling.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdMemClient.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdObjectModel.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdObjectModelInternalTypeDefs.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdObjectModelInternalTypes.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdObjectModelMetaData.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdObjectRegistrar.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdProfileZoneClient.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdUserRenderImpl.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdUserRenderTypes.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup></ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="./PxFoundation.vcxproj">
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets"></ImportGroup>
+<Project DefaultTargets="Build" ToolsVersion="15.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="release|Win32">
+			<Configuration>release</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="checked|Win32">
+			<Configuration>checked</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="profile|Win32">
+			<Configuration>profile</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+	</ItemGroup>
+	<PropertyGroup Label="Globals">
+		<ProjectGuid>{D4255C0E-3C6E-8A94-959C-54BAC884B25C}</ProjectGuid>
+		<RootNamespace>PxPvdSDK</RootNamespace>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
+		<ConfigurationType>DynamicLibrary</ConfigurationType>
+		<PlatformToolset>v141</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
+		<ConfigurationType>DynamicLibrary</ConfigurationType>
+		<PlatformToolset>v141</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'" Label="Configuration">
+		<ConfigurationType>DynamicLibrary</ConfigurationType>
+		<PlatformToolset>v141</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'" Label="Configuration">
+		<ConfigurationType>DynamicLibrary</ConfigurationType>
+		<PlatformToolset>v141</PlatformToolset>
+	</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 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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
+		<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)'=='profile|Win32'">
+		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+	</ImportGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
+		<OutDir>./../../../bin/vc15win32\</OutDir>
+		<IntDir>./Win32/PxPvdSDK/debug\</IntDir>
+		<TargetExt>.dll</TargetExt>
+		<TargetName>PxPvdSDKDEBUG_x86</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+		<SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
+			<AdditionalOptions>/GR- /GF /arch:SSE2 /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /Zi /d2Zi+</AdditionalOptions>
+			<Optimization>Disabled</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../pvd/include;./../../foundation/include;./../../filebuf/include;./../../../../Externals/nvToolsExt/1/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;PX_PVDSDK_DLL=1;PX_FOUNDATION_DLL=1;_DEBUG;PX_DEBUG=1;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Link>
+			<AdditionalOptions>/DELAYLOAD:PxFoundationDEBUG_x86.dll</AdditionalOptions>
+			<AdditionalDependencies>./../../../../Externals/nvToolsExt/1/lib/Win32/nvToolsExt32_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)PxPvdSDKDEBUG_x86.dll</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<SubSystem>Console</SubSystem>
+			<ImportLibrary>./../../../lib/vc15win32/$(TargetName).lib</ImportLibrary>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<TargetMachine>MachineX86</TargetMachine>
+		</Link>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
+		<OutDir>./../../../bin/vc15win32\</OutDir>
+		<IntDir>./Win32/PxPvdSDK/release\</IntDir>
+		<TargetExt>.dll</TargetExt>
+		<TargetName>PxPvdSDK_x86</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+		<SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/GR- /GF /arch:SSE2 /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../pvd/include;./../../foundation/include;./../../filebuf/include;./../../../../Externals/nvToolsExt/1/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;PX_PVDSDK_DLL=1;PX_FOUNDATION_DLL=1;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Link>
+			<AdditionalOptions>/INCREMENTAL:NO /DELAYLOAD:PxFoundation_x86.dll</AdditionalOptions>
+			<AdditionalDependencies>./../../../../Externals/nvToolsExt/1/lib/Win32/nvToolsExt32_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)PxPvdSDK_x86.dll</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<SubSystem>Console</SubSystem>
+			<ImportLibrary>./../../../lib/vc15win32/$(TargetName).lib</ImportLibrary>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<TargetMachine>MachineX86</TargetMachine>
+		</Link>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
+		<OutDir>./../../../bin/vc15win32\</OutDir>
+		<IntDir>./Win32/PxPvdSDK/checked\</IntDir>
+		<TargetExt>.dll</TargetExt>
+		<TargetName>PxPvdSDKCHECKED_x86</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+		<SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/GR- /GF /arch:SSE2 /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../pvd/include;./../../foundation/include;./../../filebuf/include;./../../../../Externals/nvToolsExt/1/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;PX_PVDSDK_DLL=1;PX_FOUNDATION_DLL=1;NDEBUG;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Link>
+			<AdditionalOptions>/DELAYLOAD:PxFoundationCHECKED_x86.dll</AdditionalOptions>
+			<AdditionalDependencies>./../../../../Externals/nvToolsExt/1/lib/Win32/nvToolsExt32_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)PxPvdSDKCHECKED_x86.dll</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<SubSystem>Console</SubSystem>
+			<ImportLibrary>./../../../lib/vc15win32/$(TargetName).lib</ImportLibrary>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<TargetMachine>MachineX86</TargetMachine>
+		</Link>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'">
+		<OutDir>./../../../bin/vc15win32\</OutDir>
+		<IntDir>./Win32/PxPvdSDK/profile\</IntDir>
+		<TargetExt>.dll</TargetExt>
+		<TargetName>PxPvdSDKPROFILE_x86</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+		<SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/GR- /GF /arch:SSE2 /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../pvd/include;./../../foundation/include;./../../filebuf/include;./../../../../Externals/nvToolsExt/1/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;PX_PVDSDK_DLL=1;PX_FOUNDATION_DLL=1;NDEBUG;PX_PROFILE=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Link>
+			<AdditionalOptions>/INCREMENTAL:NO /DELAYLOAD:PxFoundationPROFILE_x86.dll</AdditionalOptions>
+			<AdditionalDependencies>./../../../../Externals/nvToolsExt/1/lib/Win32/nvToolsExt32_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)PxPvdSDKPROFILE_x86.dll</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<SubSystem>Console</SubSystem>
+			<ImportLibrary>./../../../lib/vc15win32/$(TargetName).lib</ImportLibrary>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<TargetMachine>MachineX86</TargetMachine>
+		</Link>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<ItemGroup>
+		<ResourceCompile Include="..\resource_x86\PxPvdSDK.rc">
+		</ResourceCompile>
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\..\include\pvd\windows\PxWindowsPvdDelayLoadHook.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\..\include\pvd\PxPvd.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\pvd\PxPvdTransport.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\pvd\include\PsPvd.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\include\PxProfileAllocatorWrapper.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\include\PxPvdClient.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\include\PxPvdDataStream.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\include\PxPvdDataStreamHelpers.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\include\PxPvdErrorCodes.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\include\PxPvdObjectModelBaseTypes.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\include\PxPvdRenderBuffer.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\include\PxPvdUserRenderer.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\pvd\src\windows\PxWindowsPvdDelayLoadHook.cpp">
+		</ClCompile>
+	</ItemGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\pvd\src\PxProfileEventImpl.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvd.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdDataStream.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdDefaultFileTransport.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdDefaultSocketTransport.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdImpl.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdMemClient.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdObjectModelMetaData.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdObjectRegistrar.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdProfileZoneClient.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdUserRenderer.cpp">
+		</ClCompile>
+		<ClInclude Include="..\..\pvd\src\PxProfileBase.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileCompileTimeEventFilter.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileContextProvider.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileContextProviderImpl.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileDataBuffer.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileDataParsing.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventBuffer.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventBufferAtomic.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventBufferClient.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventBufferClientManager.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventFilter.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventHandler.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventId.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventMutex.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventNames.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventParser.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEvents.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventSender.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventSerialization.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventSystem.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemory.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemoryBuffer.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemoryEventBuffer.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemoryEventParser.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemoryEventRecorder.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemoryEventReflexiveWriter.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemoryEvents.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemoryEventSummarizer.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemoryEventTypes.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileScopedEvent.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileScopedMutexLock.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileZone.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileZoneImpl.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileZoneManager.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileZoneManagerImpl.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdBits.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdByteStreams.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdCommStreamEvents.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdCommStreamEventSink.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdCommStreamSDKEventTypes.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdCommStreamTypes.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdDefaultFileTransport.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdDefaultSocketTransport.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdFoundation.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdImpl.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdInternalByteStreams.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdMarshalling.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdMemClient.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdObjectModel.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdObjectModelInternalTypeDefs.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdObjectModelInternalTypes.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdObjectModelMetaData.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdObjectRegistrar.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdProfileZoneClient.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdUserRenderImpl.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdUserRenderTypes.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+	</ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="./PxFoundation.vcxproj">
+			<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+		</ProjectReference>
+	</ItemGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+	<ImportGroup Label="ExtensionTargets"></ImportGroup>
 </Project>
diff --git a/PxShared/src/compiler/vc15win32/PxTask.vcxproj b/PxShared/src/compiler/vc15win32/PxTask.vcxproj
index 7995a4b8..5087ab79 100644
--- a/PxShared/src/compiler/vc15win32/PxTask.vcxproj
+++ b/PxShared/src/compiler/vc15win32/PxTask.vcxproj
@@ -1,260 +1,238 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project
-    DefaultTargets="Build"
-    ToolsVersion="15.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="release|Win32">
-      <Configuration>release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="checked|Win32">
-      <Configuration>checked</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="profile|Win32">
-      <Configuration>profile</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{5B1132F6-84F8-142E-B951-ADB8505CC27F}</ProjectGuid>
-    <RootNamespace>PxTask</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"
-      Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='release|Win32'"
-      Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='checked|Win32'"
-      Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='profile|Win32'"
-      Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-  </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
-      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
-      Label="PropertySheets"
-      Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
-    <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)'=='profile|Win32'">
-    <Import
-        Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
-        Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
-        Label="LocalAppDataPlatform"
-    />
-  </ImportGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <OutDir>./../../../lib/vc15win32\</OutDir>
-    <IntDir>./Win32/PxTask/debug\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>$(ProjectName)DEBUG_x86</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
-      <AdditionalOptions>/GR- /GF /arch:SSE2 /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /Zi /d2Zi+</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../task/include;./../../foundation/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;_DEBUG;PX_DEBUG=1;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName)DEBUG_x86.lib</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Lib>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <OutDir>./../../../lib/vc15win32\</OutDir>
-    <IntDir>./Win32/PxTask/release\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>$(ProjectName)_x86</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/GR- /GF /arch:SSE2 /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../task/include;./../../foundation/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName)_x86.lib</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Lib>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
-    <OutDir>./../../../lib/vc15win32\</OutDir>
-    <IntDir>./Win32/PxTask/checked\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>$(ProjectName)CHECKED_x86</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/GR- /GF /arch:SSE2 /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../task/include;./../../foundation/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName)CHECKED_x86.lib</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Lib>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'">
-    <OutDir>./../../../lib/vc15win32\</OutDir>
-    <IntDir>./Win32/PxTask/profile\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>$(ProjectName)PROFILE_x86</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/GR- /GF /arch:SSE2 /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../task/include;./../../foundation/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_PROFILE=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName)PROFILE_x86.lib</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Lib>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\include\task\PxCpuDispatcher.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\task\PxGpuDispatcher.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\task\PxGpuTask.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\task\PxTask.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\task\PxTaskDefine.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\task\PxTaskManager.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\task\src\TaskManager.cpp"></ClCompile>
-  </ItemGroup>
-  <ItemGroup></ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets"></ImportGroup>
+<Project DefaultTargets="Build" ToolsVersion="15.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="release|Win32">
+			<Configuration>release</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="checked|Win32">
+			<Configuration>checked</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="profile|Win32">
+			<Configuration>profile</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+	</ItemGroup>
+	<PropertyGroup Label="Globals">
+		<ProjectGuid>{5B1132F6-84F8-142E-B951-ADB8505CC27F}</ProjectGuid>
+		<RootNamespace>PxTask</RootNamespace>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<PlatformToolset>v141</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<PlatformToolset>v141</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<PlatformToolset>v141</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<PlatformToolset>v141</PlatformToolset>
+	</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 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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
+		<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)'=='profile|Win32'">
+		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+	</ImportGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
+		<OutDir>./../../../lib/vc15win32\</OutDir>
+		<IntDir>./Win32/PxTask/debug\</IntDir>
+		<TargetExt>.lib</TargetExt>
+		<TargetName>$(ProjectName)DEBUG_x86</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
+			<AdditionalOptions>/GR- /GF /arch:SSE2 /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /Zi /d2Zi+</AdditionalOptions>
+			<Optimization>Disabled</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../task/include;./../../foundation/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;_DEBUG;PX_DEBUG=1;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Lib>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)$(ProjectName)DEBUG_x86.lib</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<TargetMachine>MachineX86</TargetMachine>
+		</Lib>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+			<LinkLibraryDependencies>true</LinkLibraryDependencies>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
+		<OutDir>./../../../lib/vc15win32\</OutDir>
+		<IntDir>./Win32/PxTask/release\</IntDir>
+		<TargetExt>.lib</TargetExt>
+		<TargetName>$(ProjectName)_x86</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/GR- /GF /arch:SSE2 /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../task/include;./../../foundation/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Lib>
+			<AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)$(ProjectName)_x86.lib</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<TargetMachine>MachineX86</TargetMachine>
+		</Lib>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+			<LinkLibraryDependencies>true</LinkLibraryDependencies>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
+		<OutDir>./../../../lib/vc15win32\</OutDir>
+		<IntDir>./Win32/PxTask/checked\</IntDir>
+		<TargetExt>.lib</TargetExt>
+		<TargetName>$(ProjectName)CHECKED_x86</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/GR- /GF /arch:SSE2 /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../task/include;./../../foundation/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Lib>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)$(ProjectName)CHECKED_x86.lib</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<TargetMachine>MachineX86</TargetMachine>
+		</Lib>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+			<LinkLibraryDependencies>true</LinkLibraryDependencies>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'">
+		<OutDir>./../../../lib/vc15win32\</OutDir>
+		<IntDir>./Win32/PxTask/profile\</IntDir>
+		<TargetExt>.lib</TargetExt>
+		<TargetName>$(ProjectName)PROFILE_x86</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/GR- /GF /arch:SSE2 /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../task/include;./../../foundation/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_PROFILE=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Lib>
+			<AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)$(ProjectName)PROFILE_x86.lib</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<TargetMachine>MachineX86</TargetMachine>
+		</Lib>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+			<LinkLibraryDependencies>true</LinkLibraryDependencies>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\..\include\task\PxCpuDispatcher.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\task\PxGpuDispatcher.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\task\PxGpuTask.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\task\PxTask.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\task\PxTaskDefine.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\task\PxTaskManager.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\task\src\TaskManager.cpp">
+		</ClCompile>
+	</ItemGroup>
+	<ItemGroup>
+	</ItemGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+	<ImportGroup Label="ExtensionTargets"></ImportGroup>
 </Project>
diff --git a/PxShared/src/compiler/vc15win64/PsFastXml.vcxproj b/PxShared/src/compiler/vc15win64/PsFastXml.vcxproj
index c6556af7..a7362657 100644
--- a/PxShared/src/compiler/vc15win64/PsFastXml.vcxproj
+++ b/PxShared/src/compiler/vc15win64/PsFastXml.vcxproj
@@ -1,254 +1,226 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project
-    DefaultTargets="Build"
-    ToolsVersion="15.0"
-    xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|x64">
-      <Configuration>debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|x64">
-      <Configuration>release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="checked|x64">
-      <Configuration>checked</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="profile|x64">
-      <Configuration>profile</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{82276A9F-CCF0-C50C-BB4A-82ACFFE2A93A}</ProjectGuid>
-    <RootNamespace>PsFastXml</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='debug|x64'"
-      Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='release|x64'"
-      Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='checked|x64'"
-      Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='profile|x64'"
-      Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings"></ImportGroup>
-  <ImportGroup
-      Label="PropertySheets"
-      Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
-    <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|x64'">
-    <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)'=='checked|x64'">
-    <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)'=='profile|x64'">
-    <Import
-        Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
-        Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
-        Label="LocalAppDataPlatform"
-    />
-  </ImportGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
-    <OutDir>./../../../lib/vc15win64\</OutDir>
-    <IntDir>./x64/PsFastXml/debug\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>$(ProjectName)DEBUG_x64</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
-      <AdditionalOptions>/GR- /GF /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /Zi /d2Zi+</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../foundation/include;./../../fastxml/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>PX_FOUNDATION_DLL=0;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;_DEBUG;PX_DEBUG=1;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName)DEBUG_x64.lib</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Lib>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
-    <OutDir>./../../../lib/vc15win64\</OutDir>
-    <IntDir>./x64/PsFastXml/release\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>$(ProjectName)_x64</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/GR- /GF /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../foundation/include;./../../fastxml/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>PX_FOUNDATION_DLL=0;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName)_x64.lib</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Lib>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'">
-    <OutDir>./../../../lib/vc15win64\</OutDir>
-    <IntDir>./x64/PsFastXml/checked\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>$(ProjectName)CHECKED_x64</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/GR- /GF /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../foundation/include;./../../fastxml/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>PX_FOUNDATION_DLL=0;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName)CHECKED_x64.lib</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Lib>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'">
-    <OutDir>./../../../lib/vc15win64\</OutDir>
-    <IntDir>./x64/PsFastXml/profile\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>$(ProjectName)PROFILE_x64</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/GR- /GF /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../foundation/include;./../../fastxml/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>PX_FOUNDATION_DLL=0;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_PROFILE=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName)PROFILE_x64.lib</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Lib>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\fastxml\include\PsFastXml.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\fastxml\src\PsFastXml.cpp"></ClCompile>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets"></ImportGroup>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<ItemGroup Label="ProjectConfigurations">
+		<ProjectConfiguration Include="debug|x64">
+			<Configuration>debug</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="release|x64">
+			<Configuration>release</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="checked|x64">
+			<Configuration>checked</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="profile|x64">
+			<Configuration>profile</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+	</ItemGroup>
+	<PropertyGroup Label="Globals">
+		<ProjectGuid>{82276A9F-CCF0-C50C-BB4A-82ACFFE2A93A}</ProjectGuid>
+		<RootNamespace>PsFastXml</RootNamespace>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<PlatformToolset>v141</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<PlatformToolset>v141</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<PlatformToolset>v141</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<PlatformToolset>v141</PlatformToolset>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+	<ImportGroup Label="ExtensionSettings">
+	</ImportGroup>
+	<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
+		<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|x64'">
+		<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)'=='checked|x64'">
+		<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)'=='profile|x64'">
+		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+	</ImportGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
+		<OutDir>./../../../lib/vc15win64\</OutDir>
+		<IntDir>./x64/PsFastXml/debug\</IntDir>
+		<TargetExt>.lib</TargetExt>
+		<TargetName>$(ProjectName)DEBUG_x64</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
+			<AdditionalOptions>/GR- /GF /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /Zi /d2Zi+</AdditionalOptions>
+			<Optimization>Disabled</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../foundation/include;./../../fastxml/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>PX_FOUNDATION_DLL=0;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;_DEBUG;PX_DEBUG=1;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Lib>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)$(ProjectName)DEBUG_x64.lib</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<TargetMachine>MachineX64</TargetMachine>
+		</Lib>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+			<LinkLibraryDependencies>true</LinkLibraryDependencies>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
+		<OutDir>./../../../lib/vc15win64\</OutDir>
+		<IntDir>./x64/PsFastXml/release\</IntDir>
+		<TargetExt>.lib</TargetExt>
+		<TargetName>$(ProjectName)_x64</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/GR- /GF /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../foundation/include;./../../fastxml/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>PX_FOUNDATION_DLL=0;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Lib>
+			<AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)$(ProjectName)_x64.lib</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<TargetMachine>MachineX64</TargetMachine>
+		</Lib>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+			<LinkLibraryDependencies>true</LinkLibraryDependencies>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'">
+		<OutDir>./../../../lib/vc15win64\</OutDir>
+		<IntDir>./x64/PsFastXml/checked\</IntDir>
+		<TargetExt>.lib</TargetExt>
+		<TargetName>$(ProjectName)CHECKED_x64</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/GR- /GF /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../foundation/include;./../../fastxml/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>PX_FOUNDATION_DLL=0;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Lib>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)$(ProjectName)CHECKED_x64.lib</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<TargetMachine>MachineX64</TargetMachine>
+		</Lib>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+			<LinkLibraryDependencies>true</LinkLibraryDependencies>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'">
+		<OutDir>./../../../lib/vc15win64\</OutDir>
+		<IntDir>./x64/PsFastXml/profile\</IntDir>
+		<TargetExt>.lib</TargetExt>
+		<TargetName>$(ProjectName)PROFILE_x64</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/GR- /GF /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../foundation/include;./../../fastxml/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>PX_FOUNDATION_DLL=0;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_PROFILE=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Lib>
+			<AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)$(ProjectName)PROFILE_x64.lib</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<TargetMachine>MachineX64</TargetMachine>
+		</Lib>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+			<LinkLibraryDependencies>true</LinkLibraryDependencies>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\fastxml\include\PsFastXml.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\fastxml\src\PsFastXml.cpp">
+		</ClCompile>
+	</ItemGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+	<ImportGroup Label="ExtensionTargets"></ImportGroup>
 </Project>
diff --git a/PxShared/src/compiler/vc15win64/PxFoundation.vcxproj b/PxShared/src/compiler/vc15win64/PxFoundation.vcxproj
index 6c444e2e..38d48611 100644
--- a/PxShared/src/compiler/vc15win64/PxFoundation.vcxproj
+++ b/PxShared/src/compiler/vc15win64/PxFoundation.vcxproj
@@ -1,368 +1,440 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project
-    DefaultTargets="Build"
-    ToolsVersion="15.0"
-    xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|x64">
-      <Configuration>debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|x64">
-      <Configuration>release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="checked|x64">
-      <Configuration>checked</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="profile|x64">
-      <Configuration>profile</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{DF4537B3-3CE9-1581-10B6-A291FE3299C6}</ProjectGuid>
-    <RootNamespace>PxFoundation</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='debug|x64'"
-      Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='release|x64'"
-      Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='checked|x64'"
-      Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='profile|x64'"
-      Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings"></ImportGroup>
-  <ImportGroup
-      Label="PropertySheets"
-      Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
-    <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|x64'">
-    <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)'=='checked|x64'">
-    <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)'=='profile|x64'">
-    <Import
-        Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
-        Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
-        Label="LocalAppDataPlatform"
-    />
-  </ImportGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
-    <OutDir>./../../../bin/vc15win64\</OutDir>
-    <IntDir>./x64/PxFoundation/debug\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>PxFoundationDEBUG_x64</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-    <SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
-      <AdditionalOptions>/GR- /GF /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /Zi /d2Zi+</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;$(WindowsSDK_IncludePath);./../../foundation/include;./../../foundation/include/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>PX_FOUNDATION_DLL=1;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;_DEBUG;PX_DEBUG=1;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)PxFoundationDEBUG_x64.dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <ImportLibrary>./../../../lib/vc15win64/$(TargetName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference></ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
-    <OutDir>./../../../bin/vc15win64\</OutDir>
-    <IntDir>./x64/PxFoundation/release\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>PxFoundation_x64</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-    <SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/GR- /GF /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;$(WindowsSDK_IncludePath);./../../foundation/include;./../../foundation/include/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>PX_FOUNDATION_DLL=1;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)PxFoundation_x64.dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <ImportLibrary>./../../../lib/vc15win64/$(TargetName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference></ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'">
-    <OutDir>./../../../bin/vc15win64\</OutDir>
-    <IntDir>./x64/PxFoundation/checked\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>PxFoundationCHECKED_x64</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-    <SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/GR- /GF /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;$(WindowsSDK_IncludePath);./../../foundation/include;./../../foundation/include/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>PX_FOUNDATION_DLL=1;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)PxFoundationCHECKED_x64.dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <ImportLibrary>./../../../lib/vc15win64/$(TargetName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference></ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'">
-    <OutDir>./../../../bin/vc15win64\</OutDir>
-    <IntDir>./x64/PxFoundation/profile\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>PxFoundationPROFILE_x64</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-    <SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/GR- /GF /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;$(WindowsSDK_IncludePath);./../../foundation/include;./../../foundation/include/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>PX_FOUNDATION_DLL=1;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_PROFILE=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)PxFoundationPROFILE_x64.dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <ImportLibrary>./../../../lib/vc15win64/$(TargetName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference></ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\resource_x64\PxFoundation.rc"></ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\include\foundation\windows\PxWindowsFoundationDelayLoadHook.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\windows\PxWindowsIntrinsics.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\include\foundation\Px.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxAllocatorCallback.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxAssert.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxBitAndData.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxBounds3.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxErrorCallback.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxErrors.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxFlags.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxFoundation.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxFoundationVersion.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxIntrinsics.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxIO.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxMat33.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxMat44.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxMath.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxMathUtils.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxMemory.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxPlane.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxPreprocessor.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxProfiler.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxQuat.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxSimpleTypes.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxStrideIterator.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxTransform.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxUnionCast.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxVec2.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxVec3.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\foundation\PxVec4.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\foundation\include\windows\PsWindowsAoS.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\windows\PsWindowsFPU.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\windows\PsWindowsInclude.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\windows\PsWindowsInlineAoS.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\windows\PsWindowsIntrinsics.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\windows\PsWindowsLoadLibrary.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\windows\PsWindowsTrigConstants.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\foundation\include\Ps.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsAlignedMalloc.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsAlloca.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsAllocator.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsAoS.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsArray.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsAtomic.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsBasicTemplates.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsBitUtils.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsBroadcast.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsCpu.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsFoundation.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsFPU.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsHash.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsHashInternals.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsHashMap.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsHashSet.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsInlineAllocator.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsInlineAoS.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsInlineArray.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsIntrinsics.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsMathUtils.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsMutex.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsPool.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsSList.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsSocket.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsSort.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsSortInternals.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsString.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsSync.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsTempAllocator.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsThread.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsTime.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsUserAllocated.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsUtilities.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsVecMath.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsVecMathAoSScalar.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsVecMathAoSScalarInline.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsVecMathSSE.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsVecMathUtilities.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsVecQuat.h"></ClInclude>
-    <ClInclude Include="..\..\foundation\include\PsVecTransform.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsAtomic.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsCpu.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsFPU.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsMutex.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsPrintString.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsSList.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsSocket.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsSync.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsThread.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\windows\PsWindowsTime.cpp"></ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\foundation\src\PsAllocator.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\PsAssert.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\PsFoundation.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\PsMathUtils.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\PsString.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\PsTempAllocator.cpp"></ClCompile>
-    <ClCompile Include="..\..\foundation\src\PsUtilities.cpp"></ClCompile>
-  </ItemGroup>
-  <ItemGroup></ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets"></ImportGroup>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<ItemGroup Label="ProjectConfigurations">
+		<ProjectConfiguration Include="debug|x64">
+			<Configuration>debug</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="release|x64">
+			<Configuration>release</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="checked|x64">
+			<Configuration>checked</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="profile|x64">
+			<Configuration>profile</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+	</ItemGroup>
+	<PropertyGroup Label="Globals">
+		<ProjectGuid>{DF4537B3-3CE9-1581-10B6-A291FE3299C6}</ProjectGuid>
+		<RootNamespace>PxFoundation</RootNamespace>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'" Label="Configuration">
+		<ConfigurationType>DynamicLibrary</ConfigurationType>
+		<PlatformToolset>v141</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'" Label="Configuration">
+		<ConfigurationType>DynamicLibrary</ConfigurationType>
+		<PlatformToolset>v141</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'" Label="Configuration">
+		<ConfigurationType>DynamicLibrary</ConfigurationType>
+		<PlatformToolset>v141</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'" Label="Configuration">
+		<ConfigurationType>DynamicLibrary</ConfigurationType>
+		<PlatformToolset>v141</PlatformToolset>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+	<ImportGroup Label="ExtensionSettings">
+	</ImportGroup>
+	<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
+		<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|x64'">
+		<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)'=='checked|x64'">
+		<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)'=='profile|x64'">
+		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+	</ImportGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
+		<OutDir>./../../../bin/vc15win64\</OutDir>
+		<IntDir>./x64/PxFoundation/debug\</IntDir>
+		<TargetExt>.dll</TargetExt>
+		<TargetName>PxFoundationDEBUG_x64</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+		<SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
+			<AdditionalOptions>/GR- /GF /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /Zi /d2Zi+</AdditionalOptions>
+			<Optimization>Disabled</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;$(WindowsSDK_IncludePath);./../../foundation/include;./../../foundation/include/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>PX_FOUNDATION_DLL=1;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;_DEBUG;PX_DEBUG=1;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Link>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)PxFoundationDEBUG_x64.dll</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<SubSystem>Console</SubSystem>
+			<ImportLibrary>./../../../lib/vc15win64/$(TargetName).lib</ImportLibrary>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<TargetMachine>MachineX64</TargetMachine>
+		</Link>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
+		<OutDir>./../../../bin/vc15win64\</OutDir>
+		<IntDir>./x64/PxFoundation/release\</IntDir>
+		<TargetExt>.dll</TargetExt>
+		<TargetName>PxFoundation_x64</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+		<SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/GR- /GF /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;$(WindowsSDK_IncludePath);./../../foundation/include;./../../foundation/include/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>PX_FOUNDATION_DLL=1;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Link>
+			<AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)PxFoundation_x64.dll</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<SubSystem>Console</SubSystem>
+			<ImportLibrary>./../../../lib/vc15win64/$(TargetName).lib</ImportLibrary>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<TargetMachine>MachineX64</TargetMachine>
+		</Link>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'">
+		<OutDir>./../../../bin/vc15win64\</OutDir>
+		<IntDir>./x64/PxFoundation/checked\</IntDir>
+		<TargetExt>.dll</TargetExt>
+		<TargetName>PxFoundationCHECKED_x64</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+		<SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/GR- /GF /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;$(WindowsSDK_IncludePath);./../../foundation/include;./../../foundation/include/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>PX_FOUNDATION_DLL=1;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Link>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)PxFoundationCHECKED_x64.dll</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<SubSystem>Console</SubSystem>
+			<ImportLibrary>./../../../lib/vc15win64/$(TargetName).lib</ImportLibrary>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<TargetMachine>MachineX64</TargetMachine>
+		</Link>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'">
+		<OutDir>./../../../bin/vc15win64\</OutDir>
+		<IntDir>./x64/PxFoundation/profile\</IntDir>
+		<TargetExt>.dll</TargetExt>
+		<TargetName>PxFoundationPROFILE_x64</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+		<SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/GR- /GF /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;$(WindowsSDK_IncludePath);./../../foundation/include;./../../foundation/include/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>PX_FOUNDATION_DLL=1;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_PROFILE=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Link>
+			<AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)PxFoundationPROFILE_x64.dll</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<SubSystem>Console</SubSystem>
+			<ImportLibrary>./../../../lib/vc15win64/$(TargetName).lib</ImportLibrary>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<TargetMachine>MachineX64</TargetMachine>
+		</Link>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<ItemGroup>
+		<ResourceCompile Include="..\resource_x64\PxFoundation.rc">
+		</ResourceCompile>
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\..\include\foundation\windows\PxWindowsFoundationDelayLoadHook.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\windows\PxWindowsIntrinsics.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\..\include\foundation\Px.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxAllocatorCallback.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxAssert.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxBitAndData.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxBounds3.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxErrorCallback.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxErrors.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxFlags.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxFoundation.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxFoundationVersion.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxIntrinsics.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxIO.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxMat33.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxMat44.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxMath.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxMathUtils.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxMemory.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxPlane.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxPreprocessor.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxProfiler.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxQuat.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxSimpleTypes.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxStrideIterator.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxTransform.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxUnionCast.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxVec2.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxVec3.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\foundation\PxVec4.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\foundation\include\windows\PsWindowsAoS.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\windows\PsWindowsFPU.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\windows\PsWindowsInclude.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\windows\PsWindowsInlineAoS.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\windows\PsWindowsIntrinsics.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\windows\PsWindowsLoadLibrary.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\windows\PsWindowsTrigConstants.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\foundation\include\Ps.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsAlignedMalloc.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsAlloca.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsAllocator.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsAoS.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsArray.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsAtomic.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsBasicTemplates.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsBitUtils.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsBroadcast.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsCpu.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsFoundation.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsFPU.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsHash.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsHashInternals.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsHashMap.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsHashSet.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsInlineAllocator.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsInlineAoS.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsInlineArray.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsIntrinsics.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsMathUtils.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsMutex.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsPool.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsSList.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsSocket.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsSort.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsSortInternals.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsString.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsSync.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsTempAllocator.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsThread.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsTime.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsUserAllocated.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsUtilities.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsVecMath.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsVecMathAoSScalar.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsVecMathAoSScalarInline.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsVecMathSSE.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsVecMathUtilities.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsVecQuat.h">
+		</ClInclude>
+		<ClInclude Include="..\..\foundation\include\PsVecTransform.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsAtomic.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsCpu.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsFPU.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsMutex.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsPrintString.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsSList.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsSocket.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsSync.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsThread.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\windows\PsWindowsTime.cpp">
+		</ClCompile>
+	</ItemGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\foundation\src\PsAllocator.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\PsAssert.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\PsFoundation.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\PsMathUtils.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\PsString.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\PsTempAllocator.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\foundation\src\PsUtilities.cpp">
+		</ClCompile>
+	</ItemGroup>
+	<ItemGroup>
+	</ItemGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+	<ImportGroup Label="ExtensionTargets"></ImportGroup>
 </Project>
diff --git a/PxShared/src/compiler/vc15win64/PxPvdSDK.vcxproj b/PxShared/src/compiler/vc15win64/PxPvdSDK.vcxproj
index e85c0871..82ee7764 100644
--- a/PxShared/src/compiler/vc15win64/PxPvdSDK.vcxproj
+++ b/PxShared/src/compiler/vc15win64/PxPvdSDK.vcxproj
@@ -1,357 +1,413 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project
-    DefaultTargets="Build"
-    ToolsVersion="15.0"
-    xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|x64">
-      <Configuration>debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|x64">
-      <Configuration>release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="checked|x64">
-      <Configuration>checked</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="profile|x64">
-      <Configuration>profile</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{D4255C0E-3C6E-8A94-959C-54BAC884B25C}</ProjectGuid>
-    <RootNamespace>PxPvdSDK</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='debug|x64'"
-      Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='release|x64'"
-      Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='checked|x64'"
-      Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='profile|x64'"
-      Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings"></ImportGroup>
-  <ImportGroup
-      Label="PropertySheets"
-      Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
-    <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|x64'">
-    <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)'=='checked|x64'">
-    <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)'=='profile|x64'">
-    <Import
-        Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
-        Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
-        Label="LocalAppDataPlatform"
-    />
-  </ImportGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
-    <OutDir>./../../../bin/vc15win64\</OutDir>
-    <IntDir>./x64/PxPvdSDK/debug\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>PxPvdSDKDEBUG_x64</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-    <SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
-      <AdditionalOptions>/GR- /GF /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /Zi /d2Zi+</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../pvd/include;./../../foundation/include;./../../filebuf/include;./../../../../Externals/nvToolsExt/1/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;PX_PVDSDK_DLL=1;PX_FOUNDATION_DLL=1;_DEBUG;PX_DEBUG=1;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>/DELAYLOAD:PxFoundationDEBUG_x64.dll</AdditionalOptions>
-      <AdditionalDependencies>./../../../../Externals/nvToolsExt/1/lib/x64/nvToolsExt64_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)PxPvdSDKDEBUG_x64.dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <ImportLibrary>./../../../lib/vc15win64/$(TargetName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference></ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
-    <OutDir>./../../../bin/vc15win64\</OutDir>
-    <IntDir>./x64/PxPvdSDK/release\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>PxPvdSDK_x64</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-    <SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/GR- /GF /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../pvd/include;./../../foundation/include;./../../filebuf/include;./../../../../Externals/nvToolsExt/1/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;PX_PVDSDK_DLL=1;PX_FOUNDATION_DLL=1;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>/INCREMENTAL:NO /DELAYLOAD:PxFoundation_x64.dll</AdditionalOptions>
-      <AdditionalDependencies>./../../../../Externals/nvToolsExt/1/lib/x64/nvToolsExt64_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)PxPvdSDK_x64.dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <ImportLibrary>./../../../lib/vc15win64/$(TargetName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference></ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'">
-    <OutDir>./../../../bin/vc15win64\</OutDir>
-    <IntDir>./x64/PxPvdSDK/checked\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>PxPvdSDKCHECKED_x64</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-    <SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/GR- /GF /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../pvd/include;./../../foundation/include;./../../filebuf/include;./../../../../Externals/nvToolsExt/1/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;PX_PVDSDK_DLL=1;PX_FOUNDATION_DLL=1;NDEBUG;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>/DELAYLOAD:PxFoundationCHECKED_x64.dll</AdditionalOptions>
-      <AdditionalDependencies>./../../../../Externals/nvToolsExt/1/lib/x64/nvToolsExt64_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)PxPvdSDKCHECKED_x64.dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <ImportLibrary>./../../../lib/vc15win64/$(TargetName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference></ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'">
-    <OutDir>./../../../bin/vc15win64\</OutDir>
-    <IntDir>./x64/PxPvdSDK/profile\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>PxPvdSDKPROFILE_x64</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-    <SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/GR- /GF /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../pvd/include;./../../foundation/include;./../../filebuf/include;./../../../../Externals/nvToolsExt/1/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;PX_PVDSDK_DLL=1;PX_FOUNDATION_DLL=1;NDEBUG;PX_PROFILE=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>/INCREMENTAL:NO /DELAYLOAD:PxFoundationPROFILE_x64.dll</AdditionalOptions>
-      <AdditionalDependencies>./../../../../Externals/nvToolsExt/1/lib/x64/nvToolsExt64_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)PxPvdSDKPROFILE_x64.dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <ImportLibrary>./../../../lib/vc15win64/$(TargetName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference></ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\resource_x64\PxPvdSDK.rc"></ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\include\pvd\windows\PxWindowsPvdDelayLoadHook.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\include\pvd\PxPvd.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\pvd\PxPvdTransport.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\pvd\include\PsPvd.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\include\PxProfileAllocatorWrapper.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\include\PxPvdClient.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\include\PxPvdDataStream.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\include\PxPvdDataStreamHelpers.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\include\PxPvdErrorCodes.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\include\PxPvdObjectModelBaseTypes.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\include\PxPvdRenderBuffer.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\include\PxPvdUserRenderer.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\pvd\src\windows\PxWindowsPvdDelayLoadHook.cpp"></ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\pvd\src\PxProfileEventImpl.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvd.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdDataStream.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdDefaultFileTransport.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdDefaultSocketTransport.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdImpl.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdMemClient.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdObjectModelMetaData.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdObjectRegistrar.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdProfileZoneClient.cpp"></ClCompile>
-    <ClCompile Include="..\..\pvd\src\PxPvdUserRenderer.cpp"></ClCompile>
-    <ClInclude Include="..\..\pvd\src\PxProfileBase.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileCompileTimeEventFilter.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileContextProvider.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileContextProviderImpl.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileDataBuffer.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileDataParsing.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventBuffer.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventBufferAtomic.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventBufferClient.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventBufferClientManager.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventFilter.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventHandler.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventId.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventMutex.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventNames.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventParser.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEvents.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventSender.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventSerialization.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileEventSystem.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemory.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemoryBuffer.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemoryEventBuffer.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemoryEventParser.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemoryEventRecorder.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemoryEventReflexiveWriter.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemoryEvents.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemoryEventSummarizer.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileMemoryEventTypes.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileScopedEvent.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileScopedMutexLock.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileZone.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileZoneImpl.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileZoneManager.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxProfileZoneManagerImpl.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdBits.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdByteStreams.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdCommStreamEvents.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdCommStreamEventSink.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdCommStreamSDKEventTypes.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdCommStreamTypes.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdDefaultFileTransport.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdDefaultSocketTransport.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdFoundation.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdImpl.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdInternalByteStreams.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdMarshalling.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdMemClient.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdObjectModel.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdObjectModelInternalTypeDefs.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdObjectModelInternalTypes.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdObjectModelMetaData.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdObjectRegistrar.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdProfileZoneClient.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdUserRenderImpl.h"></ClInclude>
-    <ClInclude Include="..\..\pvd\src\PxPvdUserRenderTypes.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup></ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="./PxFoundation.vcxproj">
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets"></ImportGroup>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<ItemGroup Label="ProjectConfigurations">
+		<ProjectConfiguration Include="debug|x64">
+			<Configuration>debug</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="release|x64">
+			<Configuration>release</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="checked|x64">
+			<Configuration>checked</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="profile|x64">
+			<Configuration>profile</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+	</ItemGroup>
+	<PropertyGroup Label="Globals">
+		<ProjectGuid>{D4255C0E-3C6E-8A94-959C-54BAC884B25C}</ProjectGuid>
+		<RootNamespace>PxPvdSDK</RootNamespace>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'" Label="Configuration">
+		<ConfigurationType>DynamicLibrary</ConfigurationType>
+		<PlatformToolset>v141</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'" Label="Configuration">
+		<ConfigurationType>DynamicLibrary</ConfigurationType>
+		<PlatformToolset>v141</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'" Label="Configuration">
+		<ConfigurationType>DynamicLibrary</ConfigurationType>
+		<PlatformToolset>v141</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'" Label="Configuration">
+		<ConfigurationType>DynamicLibrary</ConfigurationType>
+		<PlatformToolset>v141</PlatformToolset>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+	<ImportGroup Label="ExtensionSettings">
+	</ImportGroup>
+	<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
+		<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|x64'">
+		<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)'=='checked|x64'">
+		<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)'=='profile|x64'">
+		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+	</ImportGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
+		<OutDir>./../../../bin/vc15win64\</OutDir>
+		<IntDir>./x64/PxPvdSDK/debug\</IntDir>
+		<TargetExt>.dll</TargetExt>
+		<TargetName>PxPvdSDKDEBUG_x64</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+		<SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
+			<AdditionalOptions>/GR- /GF /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /Zi /d2Zi+</AdditionalOptions>
+			<Optimization>Disabled</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../pvd/include;./../../foundation/include;./../../filebuf/include;./../../../../Externals/nvToolsExt/1/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;PX_PVDSDK_DLL=1;PX_FOUNDATION_DLL=1;_DEBUG;PX_DEBUG=1;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Link>
+			<AdditionalOptions>/DELAYLOAD:PxFoundationDEBUG_x64.dll</AdditionalOptions>
+			<AdditionalDependencies>./../../../../Externals/nvToolsExt/1/lib/x64/nvToolsExt64_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)PxPvdSDKDEBUG_x64.dll</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<SubSystem>Console</SubSystem>
+			<ImportLibrary>./../../../lib/vc15win64/$(TargetName).lib</ImportLibrary>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<TargetMachine>MachineX64</TargetMachine>
+		</Link>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
+		<OutDir>./../../../bin/vc15win64\</OutDir>
+		<IntDir>./x64/PxPvdSDK/release\</IntDir>
+		<TargetExt>.dll</TargetExt>
+		<TargetName>PxPvdSDK_x64</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+		<SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/GR- /GF /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../pvd/include;./../../foundation/include;./../../filebuf/include;./../../../../Externals/nvToolsExt/1/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;PX_PVDSDK_DLL=1;PX_FOUNDATION_DLL=1;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Link>
+			<AdditionalOptions>/INCREMENTAL:NO /DELAYLOAD:PxFoundation_x64.dll</AdditionalOptions>
+			<AdditionalDependencies>./../../../../Externals/nvToolsExt/1/lib/x64/nvToolsExt64_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)PxPvdSDK_x64.dll</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<SubSystem>Console</SubSystem>
+			<ImportLibrary>./../../../lib/vc15win64/$(TargetName).lib</ImportLibrary>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<TargetMachine>MachineX64</TargetMachine>
+		</Link>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'">
+		<OutDir>./../../../bin/vc15win64\</OutDir>
+		<IntDir>./x64/PxPvdSDK/checked\</IntDir>
+		<TargetExt>.dll</TargetExt>
+		<TargetName>PxPvdSDKCHECKED_x64</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+		<SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/GR- /GF /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../pvd/include;./../../foundation/include;./../../filebuf/include;./../../../../Externals/nvToolsExt/1/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;PX_PVDSDK_DLL=1;PX_FOUNDATION_DLL=1;NDEBUG;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Link>
+			<AdditionalOptions>/DELAYLOAD:PxFoundationCHECKED_x64.dll</AdditionalOptions>
+			<AdditionalDependencies>./../../../../Externals/nvToolsExt/1/lib/x64/nvToolsExt64_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)PxPvdSDKCHECKED_x64.dll</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<SubSystem>Console</SubSystem>
+			<ImportLibrary>./../../../lib/vc15win64/$(TargetName).lib</ImportLibrary>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<TargetMachine>MachineX64</TargetMachine>
+		</Link>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'">
+		<OutDir>./../../../bin/vc15win64\</OutDir>
+		<IntDir>./x64/PxPvdSDK/profile\</IntDir>
+		<TargetExt>.dll</TargetExt>
+		<TargetName>PxPvdSDKPROFILE_x64</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+		<SkipCopyingSymbolsToOutputDirectory>true</SkipCopyingSymbolsToOutputDirectory>
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/GR- /GF /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../pvd/include;./../../foundation/include;./../../filebuf/include;./../../../../Externals/nvToolsExt/1/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;PX_PVDSDK_DLL=1;PX_FOUNDATION_DLL=1;NDEBUG;PX_PROFILE=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Link>
+			<AdditionalOptions>/INCREMENTAL:NO /DELAYLOAD:PxFoundationPROFILE_x64.dll</AdditionalOptions>
+			<AdditionalDependencies>./../../../../Externals/nvToolsExt/1/lib/x64/nvToolsExt64_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)PxPvdSDKPROFILE_x64.dll</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<SubSystem>Console</SubSystem>
+			<ImportLibrary>./../../../lib/vc15win64/$(TargetName).lib</ImportLibrary>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<TargetMachine>MachineX64</TargetMachine>
+		</Link>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<ItemGroup>
+		<ResourceCompile Include="..\resource_x64\PxPvdSDK.rc">
+		</ResourceCompile>
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\..\include\pvd\windows\PxWindowsPvdDelayLoadHook.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\..\include\pvd\PxPvd.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\pvd\PxPvdTransport.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\pvd\include\PsPvd.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\include\PxProfileAllocatorWrapper.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\include\PxPvdClient.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\include\PxPvdDataStream.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\include\PxPvdDataStreamHelpers.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\include\PxPvdErrorCodes.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\include\PxPvdObjectModelBaseTypes.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\include\PxPvdRenderBuffer.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\include\PxPvdUserRenderer.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\pvd\src\windows\PxWindowsPvdDelayLoadHook.cpp">
+		</ClCompile>
+	</ItemGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\pvd\src\PxProfileEventImpl.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvd.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdDataStream.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdDefaultFileTransport.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdDefaultSocketTransport.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdImpl.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdMemClient.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdObjectModelMetaData.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdObjectRegistrar.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdProfileZoneClient.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\pvd\src\PxPvdUserRenderer.cpp">
+		</ClCompile>
+		<ClInclude Include="..\..\pvd\src\PxProfileBase.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileCompileTimeEventFilter.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileContextProvider.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileContextProviderImpl.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileDataBuffer.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileDataParsing.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventBuffer.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventBufferAtomic.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventBufferClient.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventBufferClientManager.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventFilter.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventHandler.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventId.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventMutex.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventNames.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventParser.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEvents.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventSender.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventSerialization.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileEventSystem.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemory.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemoryBuffer.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemoryEventBuffer.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemoryEventParser.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemoryEventRecorder.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemoryEventReflexiveWriter.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemoryEvents.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemoryEventSummarizer.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileMemoryEventTypes.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileScopedEvent.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileScopedMutexLock.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileZone.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileZoneImpl.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileZoneManager.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxProfileZoneManagerImpl.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdBits.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdByteStreams.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdCommStreamEvents.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdCommStreamEventSink.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdCommStreamSDKEventTypes.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdCommStreamTypes.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdDefaultFileTransport.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdDefaultSocketTransport.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdFoundation.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdImpl.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdInternalByteStreams.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdMarshalling.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdMemClient.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdObjectModel.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdObjectModelInternalTypeDefs.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdObjectModelInternalTypes.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdObjectModelMetaData.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdObjectRegistrar.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdProfileZoneClient.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdUserRenderImpl.h">
+		</ClInclude>
+		<ClInclude Include="..\..\pvd\src\PxPvdUserRenderTypes.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+	</ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="./PxFoundation.vcxproj">
+			<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+		</ProjectReference>
+	</ItemGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+	<ImportGroup Label="ExtensionTargets"></ImportGroup>
 </Project>
diff --git a/PxShared/src/compiler/vc15win64/PxTask.vcxproj b/PxShared/src/compiler/vc15win64/PxTask.vcxproj
index 6b921678..69d06281 100644
--- a/PxShared/src/compiler/vc15win64/PxTask.vcxproj
+++ b/PxShared/src/compiler/vc15win64/PxTask.vcxproj
@@ -1,260 +1,238 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project
-    DefaultTargets="Build"
-    ToolsVersion="15.0"
-    xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug|x64">
-      <Configuration>debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release|x64">
-      <Configuration>release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="checked|x64">
-      <Configuration>checked</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="profile|x64">
-      <Configuration>profile</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{5B1132F6-84F8-142E-B951-ADB8505CC27F}</ProjectGuid>
-    <RootNamespace>PxTask</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='debug|x64'"
-      Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='release|x64'"
-      Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='checked|x64'"
-      Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup
-      Condition="'$(Configuration)|$(Platform)'=='profile|x64'"
-      Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings"></ImportGroup>
-  <ImportGroup
-      Label="PropertySheets"
-      Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
-    <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|x64'">
-    <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)'=='checked|x64'">
-    <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)'=='profile|x64'">
-    <Import
-        Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
-        Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
-        Label="LocalAppDataPlatform"
-    />
-  </ImportGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
-    <OutDir>./../../../lib/vc15win64\</OutDir>
-    <IntDir>./x64/PxTask/debug\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>$(ProjectName)DEBUG_x64</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
-      <AdditionalOptions>/GR- /GF /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /Zi /d2Zi+</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../task/include;./../../foundation/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;_DEBUG;PX_DEBUG=1;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName)DEBUG_x64.lib</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Lib>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
-    <OutDir>./../../../lib/vc15win64\</OutDir>
-    <IntDir>./x64/PxTask/release\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>$(ProjectName)_x64</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/GR- /GF /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../task/include;./../../foundation/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName)_x64.lib</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Lib>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'">
-    <OutDir>./../../../lib/vc15win64\</OutDir>
-    <IntDir>./x64/PxTask/checked\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>$(ProjectName)CHECKED_x64</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/GR- /GF /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../task/include;./../../foundation/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName)CHECKED_x64.lib</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Lib>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'">
-    <OutDir>./../../../lib/vc15win64\</OutDir>
-    <IntDir>./x64/PxTask/profile\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>$(ProjectName)PROFILE_x64</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules/>
-    <CodeAnalysisRuleAssemblies/>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalOptions>/GR- /GF /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /d2Zi+</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>./../../../include;./../../task/include;./../../foundation/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_PROFILE=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>false</ExceptionHandling>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile></PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName)PROFILE_x64.lib</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Lib>
-    <ResourceCompile></ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\include\task\PxCpuDispatcher.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\task\PxGpuDispatcher.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\task\PxGpuTask.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\task\PxTask.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\task\PxTaskDefine.h"></ClInclude>
-    <ClInclude Include="..\..\..\include\task\PxTaskManager.h"></ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\task\src\TaskManager.cpp"></ClCompile>
-  </ItemGroup>
-  <ItemGroup></ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets"></ImportGroup>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<ItemGroup Label="ProjectConfigurations">
+		<ProjectConfiguration Include="debug|x64">
+			<Configuration>debug</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="release|x64">
+			<Configuration>release</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="checked|x64">
+			<Configuration>checked</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="profile|x64">
+			<Configuration>profile</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+	</ItemGroup>
+	<PropertyGroup Label="Globals">
+		<ProjectGuid>{5B1132F6-84F8-142E-B951-ADB8505CC27F}</ProjectGuid>
+		<RootNamespace>PxTask</RootNamespace>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<PlatformToolset>v141</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<PlatformToolset>v141</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<PlatformToolset>v141</PlatformToolset>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<PlatformToolset>v141</PlatformToolset>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+	<ImportGroup Label="ExtensionSettings">
+	</ImportGroup>
+	<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
+		<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|x64'">
+		<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)'=='checked|x64'">
+		<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)'=='profile|x64'">
+		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+	</ImportGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
+		<OutDir>./../../../lib/vc15win64\</OutDir>
+		<IntDir>./x64/PxTask/debug\</IntDir>
+		<TargetExt>.lib</TargetExt>
+		<TargetName>$(ProjectName)DEBUG_x64</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
+			<AdditionalOptions>/GR- /GF /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /Zi /d2Zi+</AdditionalOptions>
+			<Optimization>Disabled</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../task/include;./../../foundation/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;_DEBUG;PX_DEBUG=1;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Lib>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)$(ProjectName)DEBUG_x64.lib</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<TargetMachine>MachineX64</TargetMachine>
+		</Lib>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+			<LinkLibraryDependencies>true</LinkLibraryDependencies>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
+		<OutDir>./../../../lib/vc15win64\</OutDir>
+		<IntDir>./x64/PxTask/release\</IntDir>
+		<TargetExt>.lib</TargetExt>
+		<TargetName>$(ProjectName)_x64</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/GR- /GF /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../task/include;./../../foundation/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Lib>
+			<AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)$(ProjectName)_x64.lib</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<TargetMachine>MachineX64</TargetMachine>
+		</Lib>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+			<LinkLibraryDependencies>true</LinkLibraryDependencies>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'">
+		<OutDir>./../../../lib/vc15win64\</OutDir>
+		<IntDir>./x64/PxTask/checked\</IntDir>
+		<TargetExt>.lib</TargetExt>
+		<TargetName>$(ProjectName)CHECKED_x64</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/GR- /GF /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../task/include;./../../foundation/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_CHECKED=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Lib>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)$(ProjectName)CHECKED_x64.lib</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<TargetMachine>MachineX64</TargetMachine>
+		</Lib>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+			<LinkLibraryDependencies>true</LinkLibraryDependencies>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'">
+		<OutDir>./../../../lib/vc15win64\</OutDir>
+		<IntDir>./x64/PxTask/profile\</IntDir>
+		<TargetExt>.lib</TargetExt>
+		<TargetName>$(ProjectName)PROFILE_x64</TargetName>
+		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRules />
+		<CodeAnalysisRuleAssemblies />
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'">
+		<ClCompile>
+			<TreatWarningAsError>true</TreatWarningAsError>
+			<BufferSecurityCheck>false</BufferSecurityCheck>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<AdditionalOptions>/GR- /GF /MP /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4464 /wd4623 /wd4626 /wd5027 /wd4987 /wd4435 /d2Zi+</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>./../../../include;./../../task/include;./../../foundation/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;PX_PROFILE=1;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<ExceptionHandling>false</ExceptionHandling>
+			<WarningLevel>Level4</WarningLevel>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<PrecompiledHeader>NotUsing</PrecompiledHeader>
+			<PrecompiledHeaderFile></PrecompiledHeaderFile>
+			<ProgramDataBaseFileName>$(TargetDir)\$(TargetName).pdb</ProgramDataBaseFileName>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<Lib>
+			<AdditionalOptions>/INCREMENTAL:NO</AdditionalOptions>
+			<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+			<OutputFile>$(OutDir)$(ProjectName)PROFILE_x64.lib</OutputFile>
+			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+			<ProgramDatabaseFile>$(TargetDir)\$(TargetName).pdb</ProgramDatabaseFile>
+			<TargetMachine>MachineX64</TargetMachine>
+		</Lib>
+		<ResourceCompile>
+		</ResourceCompile>
+		<ProjectReference>
+			<LinkLibraryDependencies>true</LinkLibraryDependencies>
+		</ProjectReference>
+	</ItemDefinitionGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\..\include\task\PxCpuDispatcher.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\task\PxGpuDispatcher.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\task\PxGpuTask.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\task\PxTask.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\task\PxTaskDefine.h">
+		</ClInclude>
+		<ClInclude Include="..\..\..\include\task\PxTaskManager.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\task\src\TaskManager.cpp">
+		</ClCompile>
+	</ItemGroup>
+	<ItemGroup>
+	</ItemGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+	<ImportGroup Label="ExtensionTargets"></ImportGroup>
 </Project>
diff --git a/PxShared/src/foundation/include/PsMutex.h b/PxShared/src/foundation/include/PsMutex.h
index 23033d09..d870fa03 100644
--- a/PxShared/src/foundation/include/PsMutex.h
+++ b/PxShared/src/foundation/include/PsMutex.h
@@ -163,7 +163,8 @@ class PX_FOUNDATION_API ReadWriteLock
 	ReadWriteLock();
 	~ReadWriteLock();
 
-	void lockReader();
+	// "takeLock" can only be false if the thread already holds the mutex, e.g. if it already acquired the write lock
+	void lockReader(bool takeLock=true);
 	void lockWriter();
 
 	void unlockReader();
@@ -173,10 +174,17 @@ class PX_FOUNDATION_API ReadWriteLock
 	class ReadWriteLockImpl* mImpl;
 };
 
+typedef MutexT<> Mutex;
+
+
+
+
+// PT: the following classes aren't used in PhysX but might still be used in APEX.
+
 class ScopedReadLock
 {
 	PX_NOCOPY(ScopedReadLock)
-  public:
+public:
 	PX_INLINE ScopedReadLock(ReadWriteLock& lock) : mLock(lock)
 	{
 		mLock.lockReader();
@@ -186,14 +194,14 @@ class ScopedReadLock
 		mLock.unlockReader();
 	}
 
-  private:
+private:
 	ReadWriteLock& mLock;
 };
 
 class ScopedWriteLock
 {
 	PX_NOCOPY(ScopedWriteLock)
-  public:
+public:
 	PX_INLINE ScopedWriteLock(ReadWriteLock& lock) : mLock(lock)
 	{
 		mLock.lockWriter();
@@ -203,22 +211,20 @@ class ScopedWriteLock
 		mLock.unlockWriter();
 	}
 
-  private:
+private:
 	ReadWriteLock& mLock;
 };
 
-typedef MutexT<> Mutex;
-
 /*
- * Use this type of lock for mutex behaviour that must operate on SPU and PPU
- * On non-PS3 platforms, it is implemented using Mutex
- */
+* Use this type of lock for mutex behaviour that must operate on SPU and PPU
+* On non-PS3 platforms, it is implemented using Mutex
+*/
 class AtomicLock
 {
 	Mutex mMutex;
 	PX_NOCOPY(AtomicLock)
 
-  public:
+public:
 	AtomicLock()
 	{
 	}
@@ -245,7 +251,7 @@ class AtomicLockCopy
 {
 	AtomicLock* pLock;
 
-  public:
+public:
 	AtomicLockCopy() : pLock(NULL)
 	{
 	}
@@ -277,7 +283,7 @@ class AtomicRwLock
 	ReadWriteLock m_Lock;
 	PX_NOCOPY(AtomicRwLock)
 
-  public:
+public:
 	AtomicRwLock()
 	{
 	}
@@ -320,10 +326,18 @@ class ScopedAtomicLock
 	}
 
 	PX_NOCOPY(ScopedAtomicLock)
-  private:
+private:
 	AtomicLock& mLock;
 };
 
+
+
+
+
+
+
+
+
 } // namespace shdfnd
 } // namespace physx
 
diff --git a/PxShared/src/foundation/src/unix/PsUnixMutex.cpp b/PxShared/src/foundation/src/unix/PsUnixMutex.cpp
index 23b65496..5ade5914 100644
--- a/PxShared/src/foundation/src/unix/PsUnixMutex.cpp
+++ b/PxShared/src/foundation/src/unix/PsUnixMutex.cpp
@@ -139,21 +139,23 @@ ReadWriteLock::~ReadWriteLock()
 	PX_FREE(mImpl);
 }
 
-void ReadWriteLock::lockReader()
+void ReadWriteLock::lockReader(bool takeLock)
 {
-	mImpl->mutex.lock();
+	if(takeLock)
+		mImpl->mutex.lock();
 
 	atomicIncrement(&mImpl->readerCounter);
 
-	mImpl->mutex.unlock();
+	if(takeLock)
+		mImpl->mutex.unlock();
 }
 
 void ReadWriteLock::lockWriter()
 {
 	mImpl->mutex.lock();
 
-	while(mImpl->readerCounter != 0)
-		;
+	// spin lock until no readers
+	while (mImpl->readerCounter);
 }
 
 void ReadWriteLock::unlockReader()
diff --git a/PxShared/src/foundation/src/windows/PsWindowsMutex.cpp b/PxShared/src/foundation/src/windows/PsWindowsMutex.cpp
index e62de47c..2b3ba00a 100644
--- a/PxShared/src/foundation/src/windows/PsWindowsMutex.cpp
+++ b/PxShared/src/foundation/src/windows/PsWindowsMutex.cpp
@@ -129,13 +129,15 @@ ReadWriteLock::~ReadWriteLock()
 	PX_FREE(mImpl);
 }
 
-void ReadWriteLock::lockReader()
+void ReadWriteLock::lockReader(bool takeLock)
 {
-	mImpl->mutex.lock();
+	if(takeLock)
+		mImpl->mutex.lock();
 
 	InterlockedIncrement(&mImpl->readerCount);
 
-	mImpl->mutex.unlock();
+	if(takeLock)
+		mImpl->mutex.unlock();
 }
 
 void ReadWriteLock::lockWriter()
@@ -143,8 +145,7 @@ void ReadWriteLock::lockWriter()
 	mImpl->mutex.lock();
 
 	// spin lock until no readers
-	while(mImpl->readerCount)
-		;
+	while(mImpl->readerCount);
 }
 
 void ReadWriteLock::unlockReader()