diff --git a/CMakeLists.txt b/CMakeLists.txt index 155dc7a..33d30d8 100644 --- a/CMakeLists.txt +++ b/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() diff --git a/DirectXMesh/DirectXMesh.h b/DirectXMesh/DirectXMesh.h index 6cfecde..e9a6265 100644 --- a/DirectXMesh/DirectXMesh.h +++ b/DirectXMesh/DirectXMesh.h @@ -26,7 +26,7 @@ #elif defined(_GAMING_XBOX) #include #elif defined(_XBOX_ONE) && defined(_TITLE) -#include +#error This library no longer supports legacy Xbox One XDK #else #include #endif diff --git a/DirectXMesh/DirectXMeshP.h b/DirectXMesh/DirectXMeshP.h index 4f7306f..c33c8e8 100644 --- a/DirectXMesh/DirectXMeshP.h +++ b/DirectXMesh/DirectXMeshP.h @@ -97,8 +97,7 @@ #include #pragma warning(pop) #elif defined(_XBOX_ONE) && defined(_TITLE) -#include -#include +#error This library no longer supports legacy Xbox One XDK #elif (_WIN32_WINNT >= _WIN32_WINNT_WIN10) #ifdef USING_DIRECTX_HEADERS #include diff --git a/DirectXMesh/DirectXMesh_XboxOneXDK_2017.vcxproj b/DirectXMesh/DirectXMesh_XboxOneXDK_2017.vcxproj deleted file mode 100644 index 04203c6..0000000 --- a/DirectXMesh/DirectXMesh_XboxOneXDK_2017.vcxproj +++ /dev/null @@ -1,204 +0,0 @@ - - - - - Release - Durango - - - Profile - Durango - - - Debug - Durango - - - - - - - - - - - - - - - - - - - - - - - - Create - Create - Create - - - - - - - - DirectXMesh - {1a920ef0-11d7-4a11-9ab7-63c4424ad096} - 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)\ - DirectXMesh - - - $(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)\ - DirectXMesh - - - $(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)\ - DirectXMesh - - - - d3d11_x.lib;combase.lib;kernelx.lib;toolhelpx.lib;uuid.lib; - - - true - Windows - true - true - false - - - Use - DirectXMeshP.h - - - 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 - DirectXMeshP.h - - - 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 - - - Use - DirectXMeshP.h - false - - - EnableAllWarnings - Disabled - true - _DEBUG;__WRL_NO_DEFAULT_LIB__;_LIB;%(PreprocessorDefinitions) - false - $(IntDir)$(TargetName).pdb - ProgramDatabase - false - - - - - - \ No newline at end of file diff --git a/DirectXMesh/DirectXMesh_XboxOneXDK_2017.vcxproj.filters b/DirectXMesh/DirectXMesh_XboxOneXDK_2017.vcxproj.filters deleted file mode 100644 index 79584ba..0000000 --- a/DirectXMesh/DirectXMesh_XboxOneXDK_2017.vcxproj.filters +++ /dev/null @@ -1,79 +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 - - - - - Header Files - - - Source Files - - - Source 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 - - - \ No newline at end of file diff --git a/DirectXMesh_XboxOneXDK_2017.sln b/DirectXMesh_XboxOneXDK_2017.sln deleted file mode 100644 index b236e85..0000000 --- a/DirectXMesh_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}") = "DirectXMesh_XboxOneXDK_2017", "DirectXMesh\DirectXMesh_XboxOneXDK_2017.vcxproj", "{1A920EF0-11D7-4A11-9AB7-63C4424AD096}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7DA88FAE-49D7-4C30-8808-5E5642768C8B}" - 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 - {1A920EF0-11D7-4A11-9AB7-63C4424AD096}.Debug|Durango.ActiveCfg = Debug|Durango - {1A920EF0-11D7-4A11-9AB7-63C4424AD096}.Debug|Durango.Build.0 = Debug|Durango - {1A920EF0-11D7-4A11-9AB7-63C4424AD096}.Profile|Durango.ActiveCfg = Profile|Durango - {1A920EF0-11D7-4A11-9AB7-63C4424AD096}.Profile|Durango.Build.0 = Profile|Durango - {1A920EF0-11D7-4A11-9AB7-63C4424AD096}.Release|Durango.ActiveCfg = Release|Durango - {1A920EF0-11D7-4A11-9AB7-63C4424AD096}.Release|Durango.Build.0 = Release|Durango - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A49A6001-B714-4D90-AE67-3ED65B947A1F} - EndGlobalSection -EndGlobal diff --git a/Meshconvert/Mesh.h b/Meshconvert/Mesh.h index 373a4f0..e26ea8b 100644 --- a/Meshconvert/Mesh.h +++ b/Meshconvert/Mesh.h @@ -19,11 +19,7 @@ #include -#if defined(_XBOX_ONE) && defined(_TITLE) -#include -#else #include -#endif #include