diff --git a/CMakeLists.txt b/CMakeLists.txt
index be04401..aa9e10a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,11 +56,14 @@ elseif(CMAKE_GENERATOR_PLATFORM MATCHES "^[Aa][Rr][Mm]64$")
set(DIRECTX_ARCH arm64)
endif()
+if(WINDOWS_STORE OR (DEFINED XBOX_CONSOLE_TARGET))
+ set(BUILD_DX12 ON)
+ set(BUILD_TOOLS OFF)
+ set(BUILD_SAMPLE OFF)
+endif()
+
if(DEFINED XBOX_CONSOLE_TARGET)
set(BUILD_DX11 OFF)
- set(BUILD_DX12 ON)
- set(BUILD_TOOLS OFF)
- set(BUILD_SAMPLE OFF)
endif()
include(GNUInstallDirs)
@@ -251,7 +254,7 @@ install(FILES
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PACKAGE_NAME})
#--- Command-line tools
-if(BUILD_TOOLS AND BUILD_DX11 AND WIN32 AND (NOT WINDOWS_STORE))
+if(BUILD_TOOLS AND BUILD_DX11 AND WIN32)
set(TOOL_EXES texassemble texconv texdiag)
add_executable(texassemble
@@ -285,7 +288,7 @@ if(BUILD_TOOLS AND BUILD_DX11 AND WIN32 AND (NOT WINDOWS_STORE))
endif()
#--- DDSView sample
-if(BUILD_SAMPLE AND BUILD_DX11 AND WIN32 AND (NOT WINDOWS_STORE))
+if(BUILD_SAMPLE AND BUILD_DX11 AND WIN32)
list(APPEND TOOL_EXES ddsview)
if(NOT COMPILED_DDSVIEW_SHADERS)
@@ -444,7 +447,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
if(BC_USE_OPENMP)
target_compile_options(${PROJECT_NAME} PRIVATE /openmp /Zc:twoPhase-)
- if(BUILD_TOOLS AND BUILD_DX11 AND WIN32 AND (NOT WINDOWS_STORE))
+ if(BUILD_TOOLS AND BUILD_DX11 AND WIN32)
target_compile_options(texconv PRIVATE /openmp /Zc:twoPhase-)
endif()
endif()
@@ -463,7 +466,7 @@ if(WIN32)
target_compile_definitions(${PROJECT_NAME} PRIVATE WINAPI_FAMILY=WINAPI_FAMILY_APP)
endif()
- if(BUILD_DX12 OR WINDOWS_STORE OR (${DIRECTX_ARCH} MATCHES "^arm64"))
+ if(BUILD_DX12 OR (${DIRECTX_ARCH} MATCHES "^arm64"))
message(STATUS "Building with DirectX 12 Runtime support")
set(WINVER 0x0A00)
elseif(${DIRECTX_ARCH} MATCHES "^arm")
@@ -485,13 +488,14 @@ if(WIN32)
endif()
endif()
-if(BUILD_TOOLS AND BUILD_DX11 AND WIN32 AND (NOT WINDOWS_STORE))
+if(BUILD_TOOLS AND BUILD_DX11 AND WIN32)
set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT texconv)
endif()
#--- Test suite
include(CTest)
-if(BUILD_TESTING AND WIN32 AND (NOT WINDOWS_STORE) AND (EXISTS "${CMAKE_CURRENT_LIST_DIR}/Tests/CMakeLists.txt"))
+if(BUILD_TESTING AND WIN32 AND (NOT WINDOWS_STORE) AND (NOT (DEFINED XBOX_CONSOLE_TARGET))
+ AND (EXISTS "${CMAKE_CURRENT_LIST_DIR}/Tests/CMakeLists.txt"))
enable_testing()
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/Tests)
endif()
diff --git a/DirectXTex/DirectXTex_XboxOneXDK_2017.vcxproj b/DirectXTex/DirectXTex_XboxOneXDK_2017.vcxproj
deleted file mode 100644
index 7bcf5d8..0000000
--- a/DirectXTex/DirectXTex_XboxOneXDK_2017.vcxproj
+++ /dev/null
@@ -1,244 +0,0 @@
-
-
-
-
- Release
- Durango
-
-
- Profile
- Durango
-
-
- Debug
- Durango
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Create
- Create
- Create
-
-
-
-
-
- Document
-
-
- Document
-
-
-
- DirectXTex
- {879b5023-53b7-4108-aeae-f019c2e9410d}
- en-US
- Win32Proj
- title
-
- v141
- 14.0
- Native
-
-
-
- StaticLibrary
- v141
- false
- Unicode
- false
- false
-
-
- StaticLibrary
- v141
- false
- Unicode
- false
- false
-
-
- StaticLibrary
- v141
- 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_2017\$(Platform)\$(Configuration)\
- Bin\XboxOneXDK_2017\$(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_2017\$(Platform)\$(Configuration)\
- Bin\XboxOneXDK_2017\$(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_2017\$(Platform)\$(Configuration)\
- Bin\XboxOneXDK_2017\$(Platform)\$(Configuration)\
- DirectXTex
-
-
-
- d3d11_x.lib;combase.lib;kernelx.lib;toolhelpx.lib;uuid.lib;
-
-
- true
- Windows
- true
- true
- false
-
-
- Use
- DirectXTexP.h
- $(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)
-
-
- MaxSpeed
- true
- NDEBUG;__WRL_NO_DEFAULT_LIB__;_LIB;%(PreprocessorDefinitions)
- EnableAllWarnings
- true
- true
- false
- $(IntDir)$(TargetName).pdb
-
-
-
-
- pixEvt.lib;d3d11_x.lib;combase.lib;kernelx.lib;toolhelpx.lib;uuid.lib;
-
-
- true
- Windows
- true
- true
- false
-
-
- Use
- DirectXTexP.h
- $(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)
-
-
- MaxSpeed
- true
- NDEBUG;__WRL_NO_DEFAULT_LIB__;_LIB;PROFILE;%(PreprocessorDefinitions)
- EnableAllWarnings
- true
- true
- false
- $(IntDir)$(TargetName).pdb
-
-
-
-
- d3d11_x.lib;combase.lib;kernelx.lib;toolhelpx.lib;uuid.lib;
- Windows
- true
- false
-
-
- DirectXTexP.h
- $(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)
- Use
- false
-
-
- EnableAllWarnings
- Disabled
- true
- _DEBUG;__WRL_NO_DEFAULT_LIB__;_LIB;%(PreprocessorDefinitions)
- false
- $(IntDir)$(TargetName).pdb
- ProgramDatabase
- false
-
-
-
-
-
-
-
- <_ATGFXCPath>$(WindowsSDK_ExecutablePath_x64.Split(';')[0])
- <_ATGFXCPath>$(_ATGFXCPath.Replace("x64",""))
- <_ATGFXCPath Condition="'$(_ATGFXCPath)' != '' and !HasTrailingSlash('$(_ATGFXCPath)')">$(_ATGFXCPath)\
-
-
-
- <_ATGFXCPath />
-
-
-
-
- <_ATGShaderHeaders Include="$(ProjectDir)Shaders/Compiled/*.inc" />
- <_ATGShaderSymbols Include="$(ProjectDir)Shaders/Compiled/*.pdb" />
-
-
-
-
-
\ No newline at end of file
diff --git a/DirectXTex/DirectXTex_XboxOneXDK_2017.vcxproj.filters b/DirectXTex/DirectXTex_XboxOneXDK_2017.vcxproj.filters
deleted file mode 100644
index 6b60823..0000000
--- a/DirectXTex/DirectXTex_XboxOneXDK_2017.vcxproj.filters
+++ /dev/null
@@ -1,118 +0,0 @@
-
-
-
-
- {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
-
-
- {c60baf7a-25a9-4215-842d-8d49d65d538e}
-
-
-
-
- Header Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
-
-
- Header Files
-
-
- Source Files\Shaders
-
-
- Source Files\Shaders
-
-
- Source Files\Shaders
-
-
-
-
- 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
-
-
- Source Files
-
-
- Source Files
-
-
-
\ No newline at end of file
diff --git a/DirectXTex_XboxOneXDK_2017.sln b/DirectXTex_XboxOneXDK_2017.sln
deleted file mode 100644
index 8bf5561..0000000
--- a/DirectXTex_XboxOneXDK_2017.sln
+++ /dev/null
@@ -1,33 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2020
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTex_XboxOneXDK_2017", "DirectXTex\DirectXTex_XboxOneXDK_2017.vcxproj", "{879B5023-53B7-4108-AEAE-F019C2E9410D}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{98781974-DA38-4814-9D99-4C17922F35F7}"
- ProjectSection(SolutionItems) = preProject
- .editorconfig = .editorconfig
- EndProjectSection
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Durango = Debug|Durango
- Profile|Durango = Profile|Durango
- Release|Durango = Release|Durango
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {879B5023-53B7-4108-AEAE-F019C2E9410D}.Debug|Durango.ActiveCfg = Debug|Durango
- {879B5023-53B7-4108-AEAE-F019C2E9410D}.Debug|Durango.Build.0 = Debug|Durango
- {879B5023-53B7-4108-AEAE-F019C2E9410D}.Profile|Durango.ActiveCfg = Profile|Durango
- {879B5023-53B7-4108-AEAE-F019C2E9410D}.Profile|Durango.Build.0 = Profile|Durango
- {879B5023-53B7-4108-AEAE-F019C2E9410D}.Release|Durango.ActiveCfg = Release|Durango
- {879B5023-53B7-4108-AEAE-F019C2E9410D}.Release|Durango.Build.0 = Release|Durango
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- SolutionGuid = {AEA78A02-2861-40C0-86D1-72DC17A9DE13}
- EndGlobalSection
-EndGlobal