From 917281720e0518ab4e881f39969d82965d0c59d6 Mon Sep 17 00:00:00 2001 From: walbourn_cp Date: Thu, 8 May 2014 13:33:19 -0700 Subject: [PATCH] Removed support for 'stock' Direct3D for Xbox One XDK platform - Removed all use of MONOLITHIC driver variable - _XBOX_ONE && _TITLE now implies using 'monolithic' Direct3D --- DirectXTex/DirectXTex_XboxOneXDK.sln | 9 -- DirectXTex/DirectXTex_XboxOneXDK.vcxproj | 147 ----------------------- 2 files changed, 156 deletions(-) diff --git a/DirectXTex/DirectXTex_XboxOneXDK.sln b/DirectXTex/DirectXTex_XboxOneXDK.sln index 7c78f02..afb341f 100644 --- a/DirectXTex/DirectXTex_XboxOneXDK.sln +++ b/DirectXTex/DirectXTex_XboxOneXDK.sln @@ -5,24 +5,15 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTex_XboxOneXDK", "Di EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug_MonoD3D|Durango = Debug_MonoD3D|Durango Debug|Durango = Debug|Durango - Profile_MonoD3D|Durango = Profile_MonoD3D|Durango Profile|Durango = Profile|Durango - Release_MonoD3D|Durango = Release_MonoD3D|Durango Release|Durango = Release|Durango EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {8424AED1-3DBF-44FA-9CF9-7FBDF1C18596}.Debug_MonoD3D|Durango.ActiveCfg = Debug_MonoD3D|Durango - {8424AED1-3DBF-44FA-9CF9-7FBDF1C18596}.Debug_MonoD3D|Durango.Build.0 = Debug_MonoD3D|Durango {8424AED1-3DBF-44FA-9CF9-7FBDF1C18596}.Debug|Durango.ActiveCfg = Debug|Durango {8424AED1-3DBF-44FA-9CF9-7FBDF1C18596}.Debug|Durango.Build.0 = Debug|Durango - {8424AED1-3DBF-44FA-9CF9-7FBDF1C18596}.Profile_MonoD3D|Durango.ActiveCfg = Profile_MonoD3D|Durango - {8424AED1-3DBF-44FA-9CF9-7FBDF1C18596}.Profile_MonoD3D|Durango.Build.0 = Profile_MonoD3D|Durango {8424AED1-3DBF-44FA-9CF9-7FBDF1C18596}.Profile|Durango.ActiveCfg = Profile|Durango {8424AED1-3DBF-44FA-9CF9-7FBDF1C18596}.Profile|Durango.Build.0 = Profile|Durango - {8424AED1-3DBF-44FA-9CF9-7FBDF1C18596}.Release_MonoD3D|Durango.ActiveCfg = Release_MonoD3D|Durango - {8424AED1-3DBF-44FA-9CF9-7FBDF1C18596}.Release_MonoD3D|Durango.Build.0 = Release_MonoD3D|Durango {8424AED1-3DBF-44FA-9CF9-7FBDF1C18596}.Release|Durango.ActiveCfg = Release|Durango {8424AED1-3DBF-44FA-9CF9-7FBDF1C18596}.Release|Durango.Build.0 = Release|Durango EndGlobalSection diff --git a/DirectXTex/DirectXTex_XboxOneXDK.vcxproj b/DirectXTex/DirectXTex_XboxOneXDK.vcxproj index 3e09eb7..ff02d76 100644 --- a/DirectXTex/DirectXTex_XboxOneXDK.vcxproj +++ b/DirectXTex/DirectXTex_XboxOneXDK.vcxproj @@ -1,18 +1,6 @@  - - Debug_MonoD3D - Durango - - - Profile_MonoD3D - Durango - - - Release_MonoD3D - Durango - Release Durango @@ -58,11 +46,8 @@ Create - Create Create - Create Create - Create @@ -86,15 +71,6 @@ false false - - StaticLibrary - v110 - false - true - Unicode - false - false - StaticLibrary v110 @@ -104,15 +80,6 @@ false false - - StaticLibrary - v110 - false - true - Unicode - false - false - StaticLibrary v110 @@ -121,14 +88,6 @@ false false - - StaticLibrary - v110 - true - Unicode - false - false - @@ -136,21 +95,12 @@ - - - - - - - - - $(Console_SdkLibPath);$(Console_SdkWindowsMetadataPath) $(Console_SdkLibPath) @@ -161,16 +111,6 @@ Bin\XboxOneXDK\$(Platform)\$(Configuration)\ DirectXTex - - $(Console_SdkLibPath);$(Console_SdkWindowsMetadataPath) - $(Console_SdkLibPath) - $(Console_SdkLibPath);$(Console_SdkWindowsMetadataPath) - $(Console_SdkIncludeRoot) - $(Console_SdkRoot)bin;$(VCInstallDir)bin\x86_amd64;$(VCInstallDir)bin;$(WindowsSDK_ExecutablePath_x86);$(VSInstallDir)Common7\Tools\bin;$(VSInstallDir)Common7\tools;$(VSInstallDir)Common7\ide;$(ProgramFiles)\HTML Help Workshop;$(MSBuildToolsPath32);$(FxCopDir);$(PATH); - Bin\XboxOneXDK\$(Platform)\$(Configuration)\ - Bin\XboxOneXDK\$(Platform)\$(Configuration)\ - DirectXTex - $(Console_SdkLibPath);$(Console_SdkWindowsMetadataPath) $(Console_SdkLibPath) @@ -181,16 +121,6 @@ Bin\XboxOneXDK\$(Platform)\$(Configuration)\ DirectXTex - - $(Console_SdkLibPath);$(Console_SdkWindowsMetadataPath) - $(Console_SdkLibPath) - $(Console_SdkLibPath);$(Console_SdkWindowsMetadataPath) - $(Console_SdkIncludeRoot) - $(Console_SdkRoot)bin;$(VCInstallDir)bin\x86_amd64;$(VCInstallDir)bin;$(WindowsSDK_ExecutablePath_x86);$(VSInstallDir)Common7\Tools\bin;$(VSInstallDir)Common7\tools;$(VSInstallDir)Common7\ide;$(ProgramFiles)\HTML Help Workshop;$(MSBuildToolsPath32);$(FxCopDir);$(PATH); - Bin\XboxOneXDK\$(Platform)\$(Configuration)\ - Bin\XboxOneXDK\$(Platform)\$(Configuration)\ - DirectXTex - $(Console_SdkLibPath);$(Console_SdkWindowsMetadataPath) $(Console_SdkLibPath) @@ -201,16 +131,6 @@ Bin\XboxOneXDK\$(Platform)\$(Configuration)\ DirectXTex - - $(Console_SdkLibPath);$(Console_SdkWindowsMetadataPath) - $(Console_SdkLibPath) - $(Console_SdkLibPath);$(Console_SdkWindowsMetadataPath) - $(Console_SdkIncludeRoot) - $(Console_SdkRoot)bin;$(VCInstallDir)bin\x86_amd64;$(VCInstallDir)bin;$(WindowsSDK_ExecutablePath_x86);$(VSInstallDir)Common7\Tools\bin;$(VSInstallDir)Common7\tools;$(VSInstallDir)Common7\ide;$(ProgramFiles)\HTML Help Workshop;$(MSBuildToolsPath32);$(FxCopDir);$(PATH); - Bin\XboxOneXDK\$(Platform)\$(Configuration)\ - Bin\XboxOneXDK\$(Platform)\$(Configuration)\ - DirectXTex - d3d11.lib;combase.lib;kernelx.lib;uuid.lib; @@ -235,30 +155,6 @@ $(IntDir)$(TargetName).pdb - - - d3d11.lib;combase.lib;kernelx.lib;uuid.lib; - - - true - Windows - true - true - false - - - Use - DirectXTexP.h - $(Console_SdkPackagesRoot);$(Console_SdkWindowsMetadataPath);%(AdditionalUsingDirectories) - MaxSpeed - MONOLITHIC=1;NDEBUG;__WRL_NO_DEFAULT_LIB__;_LIB;%(PreprocessorDefinitions) - Level4 - true - true - false - $(IntDir)$(TargetName).pdb - - pixEvt.lib;d3d11i.lib;combase.lib;kernelx.lib;uuid.lib; @@ -283,30 +179,6 @@ $(IntDir)$(TargetName).pdb - - - pixEvt.lib;d3d11i.lib;combase.lib;kernelx.lib;uuid.lib; - - - true - Windows - true - true - false - - - Use - DirectXTexP.h - $(Console_SdkPackagesRoot);$(Console_SdkWindowsMetadataPath);%(AdditionalUsingDirectories) - MaxSpeed - MONOLITHIC=1;NDEBUG;__WRL_NO_DEFAULT_LIB__;_LIB;PROFILE;%(PreprocessorDefinitions) - Level4 - true - true - false - $(IntDir)$(TargetName).pdb - - d3d11i.lib;combase.lib;kernelx.lib;uuid.lib; @@ -326,25 +198,6 @@ $(IntDir)$(TargetName).pdb - - - d3d11i.lib;combase.lib;kernelx.lib;uuid.lib; - Windows - true - false - - - DirectXTexP.h - Use - false - $(Console_SdkPackagesRoot);$(Console_SdkWindowsMetadataPath);%(AdditionalUsingDirectories) - Level4 - Disabled - MONOLITHIC=1;_DEBUG;__WRL_NO_DEFAULT_LIB__;_LIB;%(PreprocessorDefinitions) - false - $(IntDir)$(TargetName).pdb - -