From 0d59f52ac9d3f5eb54b4c6155fd33b23b600c366 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Fri, 17 Mar 2023 15:47:13 -0700 Subject: [PATCH] Retire legacy Xbox One XDK support (#106) --- CMakeLists.txt | 9 +- UVAtlas/UVAtlas_XboxOneXDK_2017.vcxproj | 235 ------------------ .../UVAtlas_XboxOneXDK_2017.vcxproj.filters | 166 ------------- UVAtlas/inc/UVAtlas.h | 2 +- UVAtlasTool/Mesh.h | 4 - UVAtlas_XboxOneXDK_2017.sln | 33 --- 6 files changed, 6 insertions(+), 443 deletions(-) delete mode 100644 UVAtlas/UVAtlas_XboxOneXDK_2017.vcxproj delete mode 100644 UVAtlas/UVAtlas_XboxOneXDK_2017.vcxproj.filters delete mode 100644 UVAtlas_XboxOneXDK_2017.sln diff --git a/CMakeLists.txt b/CMakeLists.txt index 0a644e5..16d100e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,7 +56,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_TOOLS OFF) endif() @@ -221,7 +221,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 uvatlastool) message(STATUS "Using DirectXMesh and DirectXTex (required for uvatlastool).") @@ -402,13 +402,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 uvatlastool) 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/UVAtlas/UVAtlas_XboxOneXDK_2017.vcxproj b/UVAtlas/UVAtlas_XboxOneXDK_2017.vcxproj deleted file mode 100644 index 730aade..0000000 --- a/UVAtlas/UVAtlas_XboxOneXDK_2017.vcxproj +++ /dev/null @@ -1,235 +0,0 @@ - - - - - Release - Durango - - - Profile - Durango - - - Debug - Durango - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Create - Create - Create - - - - - - - - - - UVAtlas - {5959d651-867b-4ad9-babd-4265310b6d5d} - en-US - Win32Proj - title - - v110 - 11.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)\ - UVAtlas - - - $(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)\ - UVAtlas - - - $(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)\ - UVAtlas - - - - d3d11_x.lib;combase.lib;kernelx.lib;uuid.lib; - - - true - Windows - true - true - false - - - Use - pch.h - - - MaxSpeed - true - NDEBUG;__WRL_NO_DEFAULT_LIB__;_LIB;%(PreprocessorDefinitions) - EnableAllWarnings - true - true - false - $(ProjectDir);$(ProjectDir)Inc;$(ProjectDir)geodesics;$(ProjectDir)isochart;%(AdditionalIncludeDirectories) - $(IntDir)$(TargetName).pdb - - - - - pixEvt.lib;d3d11_x.lib;combase.lib;kernelx.lib;uuid.lib; - - - true - Windows - true - true - false - - - Use - pch.h - - - MaxSpeed - true - NDEBUG;__WRL_NO_DEFAULT_LIB__;_LIB;PROFILE;%(PreprocessorDefinitions) - EnableAllWarnings - true - true - false - $(ProjectDir);$(ProjectDir)Inc;$(ProjectDir)geodesics;$(ProjectDir)isochart;%(AdditionalIncludeDirectories) - $(IntDir)$(TargetName).pdb - - - - - d3d11_x.lib;combase.lib;kernelx.lib;uuid.lib; - Windows - true - false - - - Use - pch.h - false - - - EnableAllWarnings - Disabled - true - _DEBUG;__WRL_NO_DEFAULT_LIB__;_LIB;%(PreprocessorDefinitions) - false - $(ProjectDir);$(ProjectDir)Inc;$(ProjectDir)geodesics;$(ProjectDir)isochart;%(AdditionalIncludeDirectories) - $(IntDir)$(TargetName).pdb - ProgramDatabase - false - - - - - - \ No newline at end of file diff --git a/UVAtlas/UVAtlas_XboxOneXDK_2017.vcxproj.filters b/UVAtlas/UVAtlas_XboxOneXDK_2017.vcxproj.filters deleted file mode 100644 index 8578d95..0000000 --- a/UVAtlas/UVAtlas_XboxOneXDK_2017.vcxproj.filters +++ /dev/null @@ -1,166 +0,0 @@ - - - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {ec40e560-79b7-49f4-87b7-65b05c4025e0} - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Header Files - - - Header Files - - - Geodesics - - - Geodesics - - - Geodesics - - - Geodesics - - - Geodesics - - - Isochart - - - Isochart - - - Isochart - - - Isochart - - - Isochart - - - Isochart - - - Isochart - - - Isochart - - - Isochart - - - Isochart - - - Isochart - - - Isochart - - - Isochart - - - Isochart - - - Isochart - - - Header Files - - - - - Geodesics - - - Geodesics - - - Geodesics - - - Isochart - - - Isochart - - - Isochart - - - Isochart - - - Isochart - - - Isochart - - - Isochart - - - Isochart - - - Isochart - - - Isochart - - - Isochart - - - Isochart - - - Isochart - - - Isochart - - - Isochart - - - Isochart - - - Isochart - - - Isochart - - - Isochart - - - Isochart - - - Isochart - - - - - Isochart - - - \ No newline at end of file diff --git a/UVAtlas/inc/UVAtlas.h b/UVAtlas/inc/UVAtlas.h index d69760c..0cbc44a 100644 --- a/UVAtlas/inc/UVAtlas.h +++ b/UVAtlas/inc/UVAtlas.h @@ -21,7 +21,7 @@ #include #pragma warning(pop) #elif defined(_XBOX_ONE) && defined(_TITLE) -#include +#error This library no longer supports legacy Xbox One XDK #else #include #ifdef USING_DIRECTX_HEADERS diff --git a/UVAtlasTool/Mesh.h b/UVAtlasTool/Mesh.h index ee8f5d8..b9617b1 100644 --- a/UVAtlasTool/Mesh.h +++ b/UVAtlasTool/Mesh.h @@ -19,11 +19,7 @@ #include -#if defined(_XBOX_ONE) && defined(_TITLE) -#include -#else #include -#endif #include diff --git a/UVAtlas_XboxOneXDK_2017.sln b/UVAtlas_XboxOneXDK_2017.sln deleted file mode 100644 index 9a11fde..0000000 --- a/UVAtlas_XboxOneXDK_2017.sln +++ /dev/null @@ -1,33 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27703.2000 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UVAtlas_XboxOneXDK_2017", "UVAtlas\UVAtlas_XboxOneXDK_2017.vcxproj", "{5959D651-867B-4AD9-BABD-4265310B6D5D}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{6F8C099A-349F-40E8-8D9F-D0B3B6CDCB49}" - 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 - {5959D651-867B-4AD9-BABD-4265310B6D5D}.Debug|Durango.ActiveCfg = Debug|Durango - {5959D651-867B-4AD9-BABD-4265310B6D5D}.Debug|Durango.Build.0 = Debug|Durango - {5959D651-867B-4AD9-BABD-4265310B6D5D}.Profile|Durango.ActiveCfg = Profile|Durango - {5959D651-867B-4AD9-BABD-4265310B6D5D}.Profile|Durango.Build.0 = Profile|Durango - {5959D651-867B-4AD9-BABD-4265310B6D5D}.Release|Durango.ActiveCfg = Release|Durango - {5959D651-867B-4AD9-BABD-4265310B6D5D}.Release|Durango.Build.0 = Release|Durango - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {029D3A14-07EE-4D69-A40C-204AB05DEF66} - EndGlobalSection -EndGlobal