Retire legacy Xbox One XDK support (#90)

CMakeLists.txt

@@ -43,7 +43,7 @@ elseif(CMAKE_GENERATOR_PLATFORM MATCHES "^[Aa][Rr][Mm]64$")
     set(DIRECTX_ARCH arm64)
 endif()
 
-if(DEFINED XBOX_CONSOLE_TARGET)
+if(WINDOWS_STORE OR (DEFINED XBOX_CONSOLE_TARGET))
   set(BUILD_DX12 ON)
   set(BUILD_TOOLS OFF)
 endif()
@@ -196,7 +196,7 @@ install(FILES
   DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PACKAGE_NAME})
 
 #--- Command-line tool
-if(BUILD_TOOLS AND WIN32 AND (NOT WINDOWS_STORE))
+if(BUILD_TOOLS AND WIN32)
   set(TOOL_EXES meshconvert)
 
   add_executable(meshconvert
@@ -342,7 +342,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")
@@ -363,13 +363,14 @@ if(WIN32)
     endif()
 endif()
 
-if(BUILD_TOOLS AND WIN32 AND (NOT WINDOWS_STORE))
+if(BUILD_TOOLS AND WIN32)
   set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT meshconvert)
 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()

DirectXMesh/DirectXMesh.h

@@ -26,7 +26,7 @@
 #elif defined(_GAMING_XBOX)
 #include <d3d12_x.h>
 #elif defined(_XBOX_ONE) && defined(_TITLE)
-#include <d3d11_x.h>
+#error This library no longer supports legacy Xbox One XDK
 #else
 #include <d3d11_1.h>
 #endif

DirectXMesh/DirectXMeshP.h

@@ -97,8 +97,7 @@
 #include <d3d12_x.h>
 #pragma warning(pop)
 #elif defined(_XBOX_ONE) && defined(_TITLE)
-#include <d3d12_x.h>
-#include <d3d11_x.h>
+#error This library no longer supports legacy Xbox One XDK
 #elif (_WIN32_WINNT >= _WIN32_WINNT_WIN10)
 #ifdef USING_DIRECTX_HEADERS
 #include <directx/dxgiformat.h>

Meshconvert/Mesh.h

@@ -19,11 +19,7 @@
 #include <string>
 
 
-#if defined(_XBOX_ONE) && defined(_TITLE)
-#include <d3d11_x.h>
-#else
 #include <d3d11_1.h>
-#endif
 
 #include <DirectXMath.h>