From c3e961c571938ce25ffcf4cde89cc106275f3e7c Mon Sep 17 00:00:00 2001 From: Matthieu Bucchianeri Date: Tue, 12 Dec 2023 00:08:30 -0800 Subject: [PATCH] Fix build issue with VS2022. --- .gitmodules | 3 +++ external/OpenXR-MixedReality-Samples | 2 +- external/fmt | 1 + openxr-api-layer/openxr-api-layer.vcxproj | 10 ++++------ openxr-api-layer/packages.config | 1 - openxr-api-layer/pch.h | 1 + 6 files changed, 10 insertions(+), 8 deletions(-) create mode 160000 external/fmt diff --git a/.gitmodules b/.gitmodules index bff6caf..e21891e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -23,3 +23,6 @@ [submodule "external/oscpack"] path = external/oscpack url = https://github.com/RossBencina/oscpack.git +[submodule "external/fmt"] + path = external/fmt + url = https://github.com/fmtlib/fmt.git diff --git a/external/OpenXR-MixedReality-Samples b/external/OpenXR-MixedReality-Samples index 5cf3788..02b897c 160000 --- a/external/OpenXR-MixedReality-Samples +++ b/external/OpenXR-MixedReality-Samples @@ -1 +1 @@ -Subproject commit 5cf37880a771301676c6de0aec9b1f2ebe5997b4 +Subproject commit 02b897ca9adf8d8590137dce12e30c91fc7ed2ff diff --git a/external/fmt b/external/fmt new file mode 160000 index 0000000..f5e5435 --- /dev/null +++ b/external/fmt @@ -0,0 +1 @@ +Subproject commit f5e54359df4c26b6230fc61d38aa294581393084 diff --git a/openxr-api-layer/openxr-api-layer.vcxproj b/openxr-api-layer/openxr-api-layer.vcxproj index a655996..958a22e 100644 --- a/openxr-api-layer/openxr-api-layer.vcxproj +++ b/openxr-api-layer/openxr-api-layer.vcxproj @@ -105,7 +105,7 @@ true Use pch.h - $(ProjectDir);$(ProjectDir)\framework;$(SolutionDir)\external\OpenXR-SDK\include;$(SolutionDir)\external\OpenXR-SDK\src\common;$(SolutionDir)\external\OpenXR-MixedReality\Shared\XrUtility;$(SolutionDir)\external\Omnicept-SDK\include;$(SolutionDir)\external\Varjo-SDK\include;$(SolutionDir)\external\PVR;$(SolutionDir)\external\oscpack + $(ProjectDir);$(ProjectDir)\framework;$(SolutionDir)\external\OpenXR-SDK\include;$(SolutionDir)\external\OpenXR-SDK\src\common;$(SolutionDir)\external\OpenXR-MixedReality\Shared\XrUtility;$(SolutionDir)\external\fmt\include\;$(SolutionDir)\external\Omnicept-SDK\include;$(SolutionDir)\external\Varjo-SDK\include;$(SolutionDir)\external\PVR;$(SolutionDir)\external\oscpack stdcpp17 @@ -172,7 +172,7 @@ $(SolutionDir)\scripts\sed.exe -i "s/VALUE \"ProductVersion\", \".*\"$/VALUE \"P true Use pch.h - $(ProjectDir);$(ProjectDir)\framework;$(SolutionDir)\external\OpenXR-SDK\include;$(SolutionDir)\external\OpenXR-SDK\src\common;$(SolutionDir)\external\OpenXR-MixedReality\Shared\XrUtility;$(SolutionDir)\external\Omnicept-SDK\include;$(SolutionDir)\external\Varjo-SDK\include;$(SolutionDir)\external\PVR;$(SolutionDir)\external\oscpack + $(ProjectDir);$(ProjectDir)\framework;$(SolutionDir)\external\OpenXR-SDK\include;$(SolutionDir)\external\OpenXR-SDK\src\common;$(SolutionDir)\external\OpenXR-MixedReality\Shared\XrUtility;$(SolutionDir)\external\fmt\include\;$(SolutionDir)\external\Omnicept-SDK\include;$(SolutionDir)\external\Varjo-SDK\include;$(SolutionDir)\external\PVR;$(SolutionDir)\external\oscpack stdcpp17 @@ -239,7 +239,7 @@ $(SolutionDir)\scripts\sed.exe -i "s/VALUE \"ProductVersion\", \".*\"$/VALUE \"P true Use pch.h - $(ProjectDir);$(ProjectDir)\framework;$(SolutionDir)\external\OpenXR-SDK\include;$(SolutionDir)\external\OpenXR-SDK\src\common;$(SolutionDir)\external\OpenXR-MixedReality\Shared\XrUtility;$(SolutionDir)\external\Omnicept-SDK\include;$(SolutionDir)\external\Varjo-SDK\include;$(SolutionDir)\external\PVR;$(SolutionDir)\external\oscpack + $(ProjectDir);$(ProjectDir)\framework;$(SolutionDir)\external\OpenXR-SDK\include;$(SolutionDir)\external\OpenXR-SDK\src\common;$(SolutionDir)\external\OpenXR-MixedReality\Shared\XrUtility;$(SolutionDir)\external\fmt\include\;$(SolutionDir)\external\Omnicept-SDK\include;$(SolutionDir)\external\Varjo-SDK\include;$(SolutionDir)\external\PVR;$(SolutionDir)\external\oscpack stdcpp17 @@ -310,7 +310,7 @@ $(SolutionDir)\scripts\sed.exe -i "s/VALUE \"ProductVersion\", \".*\"$/VALUE \"P true Use pch.h - $(ProjectDir);$(ProjectDir)\framework;$(SolutionDir)\external\OpenXR-SDK\include;$(SolutionDir)\external\OpenXR-SDK\src\common;$(SolutionDir)\external\OpenXR-MixedReality\Shared\XrUtility;$(SolutionDir)\external\Omnicept-SDK\include;$(SolutionDir)\external\Varjo-SDK\include;$(SolutionDir)\external\PVR;$(SolutionDir)\external\oscpack + $(ProjectDir);$(ProjectDir)\framework;$(SolutionDir)\external\OpenXR-SDK\include;$(SolutionDir)\external\OpenXR-SDK\src\common;$(SolutionDir)\external\OpenXR-MixedReality\Shared\XrUtility;$(SolutionDir)\external\fmt\include\;$(SolutionDir)\external\Omnicept-SDK\include;$(SolutionDir)\external\Varjo-SDK\include;$(SolutionDir)\external\PVR;$(SolutionDir)\external\oscpack stdcpp17 @@ -429,7 +429,6 @@ $(SolutionDir)\scripts\sed.exe -i "s/VALUE \"ProductVersion\", \".*\"$/VALUE \"P - @@ -437,7 +436,6 @@ $(SolutionDir)\scripts\sed.exe -i "s/VALUE \"ProductVersion\", \".*\"$/VALUE \"P This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - diff --git a/openxr-api-layer/packages.config b/openxr-api-layer/packages.config index c72d1a9..d69a751 100644 --- a/openxr-api-layer/packages.config +++ b/openxr-api-layer/packages.config @@ -1,6 +1,5 @@  - \ No newline at end of file diff --git a/openxr-api-layer/pch.h b/openxr-api-layer/pch.h index 575d14c..bc9de37 100644 --- a/openxr-api-layer/pch.h +++ b/openxr-api-layer/pch.h @@ -89,6 +89,7 @@ using Microsoft::WRL::ComPtr; #include // FMT formatter. +#define FMT_HEADER_ONLY #include #if defined(XR_USE_GRAPHICS_API_D3D11) || defined(XR_USE_GRAPHICS_API_D3D12)