diff --git a/DirectXTex/DDS.h b/DirectXTex/DDS.h index e9fb4aa..984b740 100644 --- a/DirectXTex/DDS.h +++ b/DirectXTex/DDS.h @@ -22,7 +22,11 @@ #pragma once #endif +#if defined(_XBOX_ONE) && defined(_TITLE) && MONOLITHIC +#include +#else #include +#endif #pragma warning(push) #pragma warning(disable : 4005) diff --git a/DirectXTex/DirectXTex.h b/DirectXTex/DirectXTex.h index ed2869d..d50ee41 100644 --- a/DirectXTex/DirectXTex.h +++ b/DirectXTex/DirectXTex.h @@ -25,7 +25,10 @@ #include #include -#if (_WIN32_WINNT >= 0x0602) || defined(_WIN7_PLATFORM_UPDATE) +#if defined(_XBOX_ONE) && defined(_TITLE) && MONOLITHIC +#include +#define DCOMMON_H_INCLUDED +#elif (_WIN32_WINNT >= 0x0602) || defined(_WIN7_PLATFORM_UPDATE) #include #else #include diff --git a/DirectXTex/DirectXTexD3D11.cpp b/DirectXTex/DirectXTexD3D11.cpp index 37bfa0b..f117a12 100644 --- a/DirectXTex/DirectXTexD3D11.cpp +++ b/DirectXTex/DirectXTexD3D11.cpp @@ -15,7 +15,9 @@ #include "directxtexp.h" +#if !defined(_XBOX_ONE) || !defined(_TITLE) || !MONOLITHIC #include +#endif namespace DirectX { diff --git a/DirectXTex/DirectXTexP.h b/DirectXTex/DirectXTexP.h index 0a7b623..72ed375 100644 --- a/DirectXTex/DirectXTexP.h +++ b/DirectXTex/DirectXTexP.h @@ -45,7 +45,7 @@ #include "directxtex.h" -#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE) +#if ( (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE) ) && !defined(_XBOX_ONE) #include #endif diff --git a/DirectXTex/DirectXTex_XboxOneADK.sln b/DirectXTex/DirectXTex_XboxOneADK.sln new file mode 100644 index 0000000..41ff99c --- /dev/null +++ b/DirectXTex/DirectXTex_XboxOneADK.sln @@ -0,0 +1,23 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTex_XboxOneADK", "DirectXTex_XboxOneADK.vcxproj", "{8F6CD012-9AD4-4EE1-9CBE-7B112E5CEB39}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Durango = Debug|Durango + Profile|Durango = Profile|Durango + Release|Durango = Release|Durango + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {8F6CD012-9AD4-4EE1-9CBE-7B112E5CEB39}.Debug|Durango.ActiveCfg = Debug|Durango + {8F6CD012-9AD4-4EE1-9CBE-7B112E5CEB39}.Debug|Durango.Build.0 = Debug|Durango + {8F6CD012-9AD4-4EE1-9CBE-7B112E5CEB39}.Profile|Durango.ActiveCfg = Profile|Durango + {8F6CD012-9AD4-4EE1-9CBE-7B112E5CEB39}.Profile|Durango.Build.0 = Profile|Durango + {8F6CD012-9AD4-4EE1-9CBE-7B112E5CEB39}.Release|Durango.ActiveCfg = Release|Durango + {8F6CD012-9AD4-4EE1-9CBE-7B112E5CEB39}.Release|Durango.Build.0 = Release|Durango + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/DirectXTex/DirectXTex_XboxOneADK.vcxproj b/DirectXTex/DirectXTex_XboxOneADK.vcxproj new file mode 100644 index 0000000..6665f7b --- /dev/null +++ b/DirectXTex/DirectXTex_XboxOneADK.vcxproj @@ -0,0 +1,203 @@ + + + + + Release + Durango + + + Profile + Durango + + + Debug + Durango + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Create + Create + Create + + + + + DirectXTex_XboxOneADK + {8f6cd012-9ad4-4ee1-9cbe-7b112e5ceb39} + en-US + Win32Proj + v110 + 11.0 + Native + + + + StaticLibrary + v110 + false + true + Unicode + false + false + + + StaticLibrary + v110 + false + true + Unicode + false + false + + + StaticLibrary + v110 + true + Unicode + false + false + + + + + + + + + + + + + + + + $(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\XboxOneADK\$(Platform)\$(Configuration)\ + Bin\XboxOneADK\$(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\XboxOneADK\$(Platform)\$(Configuration)\ + Bin\XboxOneADK\$(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\XboxOneADK\$(Platform)\$(Configuration)\ + Bin\XboxOneADK\$(Platform)\$(Configuration)\ + DirectXTex + + + + d3d11.lib;runtimeobject.lib;mincore.lib;mincore_legacy.lib;mincore_obsolete.lib;user32.lib;uuid.lib; + + + true + Windows + true + true + false + + + Use + DirectXTexP.h + $(Console_SdkPackagesRoot);$(Console_SdkWindowsMetadataPath);%(AdditionalUsingDirectories) + MaxSpeed + NDEBUG;_LIB;%(PreprocessorDefinitions) + Level4 + true + true + false + $(IntDir)$(TargetName).pdb + + + + + d3d11.lib;runtimeobject.lib;mincore.lib;mincore_legacy.lib;mincore_obsolete.lib;user32.lib;uuid.lib; + + + true + Windows + true + true + false + + + Use + DirectXTexP.h + $(Console_SdkWindowsMetadataPath);%(AdditionalUsingDirectories) + MaxSpeed + NDEBUG;_LIB;PROFILE;%(PreprocessorDefinitions) + Level4 + true + true + false + $(IntDir)$(TargetName).pdb + + + + + d3d11.lib;runtimeobject.lib;mincore.lib;mincore_legacy.lib;mincore_obsolete.lib;user32.lib;uuid.lib; + Windows + true + false + + + DirectXTexP.h + Use + false + $(Console_SdkPackagesRoot);$(Console_SdkWindowsMetadataPath);%(AdditionalUsingDirectories) + Level4 + Disabled + _DEBUG;_LIB;%(PreprocessorDefinitions) + false + $(IntDir)$(TargetName).pdb + + + + + + \ No newline at end of file diff --git a/DirectXTex/DirectXTex_XboxOneADK.vcxproj.filters b/DirectXTex/DirectXTex_XboxOneADK.vcxproj.filters new file mode 100644 index 0000000..41db806 --- /dev/null +++ b/DirectXTex/DirectXTex_XboxOneADK.vcxproj.filters @@ -0,0 +1,104 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/DirectXTex/DirectXTex_XboxOneXDK.sln b/DirectXTex/DirectXTex_XboxOneXDK.sln new file mode 100644 index 0000000..7c78f02 --- /dev/null +++ b/DirectXTex/DirectXTex_XboxOneXDK.sln @@ -0,0 +1,32 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTex_XboxOneXDK", "DirectXTex_XboxOneXDK.vcxproj", "{8424AED1-3DBF-44FA-9CF9-7FBDF1C18596}" +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 + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/DirectXTex/DirectXTex_XboxOneXDK.vcxproj b/DirectXTex/DirectXTex_XboxOneXDK.vcxproj new file mode 100644 index 0000000..3e09eb7 --- /dev/null +++ b/DirectXTex/DirectXTex_XboxOneXDK.vcxproj @@ -0,0 +1,351 @@ + + + + + Debug_MonoD3D + Durango + + + Profile_MonoD3D + Durango + + + Release_MonoD3D + Durango + + + Release + Durango + + + Profile + Durango + + + Debug + Durango + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Create + Create + Create + Create + Create + Create + + + + + DirectXTex_XboxOneXDK + {8424aed1-3dbf-44fa-9cf9-7fbdf1c18596} + en-US + Win32Proj + title + v110 + 11.0 + Native + + + + StaticLibrary + v110 + false + true + Unicode + false + false + + + StaticLibrary + v110 + false + true + Unicode + false + false + + + StaticLibrary + v110 + false + true + Unicode + false + false + + + StaticLibrary + v110 + false + true + Unicode + false + false + + + StaticLibrary + v110 + true + Unicode + false + false + + + StaticLibrary + v110 + true + Unicode + false + false + + + + + + + + + + + + + + + + + + + + + + + + + $(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) + $(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) + $(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) + $(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) + $(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) + $(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; + + + true + Windows + true + true + false + + + Use + DirectXTexP.h + $(Console_SdkPackagesRoot);$(Console_SdkWindowsMetadataPath);%(AdditionalUsingDirectories) + MaxSpeed + NDEBUG;__WRL_NO_DEFAULT_LIB__;_LIB;%(PreprocessorDefinitions) + Level4 + true + true + false + $(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; + + + true + Windows + true + true + false + + + Use + DirectXTexP.h + $(Console_SdkPackagesRoot);$(Console_SdkWindowsMetadataPath);%(AdditionalUsingDirectories) + MaxSpeed + NDEBUG;__WRL_NO_DEFAULT_LIB__;_LIB;PROFILE;%(PreprocessorDefinitions) + Level4 + true + true + false + $(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; + Windows + true + false + + + DirectXTexP.h + Use + false + $(Console_SdkPackagesRoot);$(Console_SdkWindowsMetadataPath);%(AdditionalUsingDirectories) + Level4 + Disabled + _DEBUG;__WRL_NO_DEFAULT_LIB__;_LIB;%(PreprocessorDefinitions) + false + $(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 + + + + + + \ No newline at end of file diff --git a/DirectXTex/DirectXTex_XboxOneXDK.vcxproj.filters b/DirectXTex/DirectXTex_XboxOneXDK.vcxproj.filters new file mode 100644 index 0000000..41db806 --- /dev/null +++ b/DirectXTex/DirectXTex_XboxOneXDK.vcxproj.filters @@ -0,0 +1,104 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file