Re: [Flightgear-devel] VR Options Menu Is Not Available In Daily Build

[James H. <ja...@al...>]

On Friday, 12 August 2022 11:02:38 BST James Turner wrote:
> > On 12 Aug 2022, at 10:59, James Hogan <ja...@al...> wrote:
> > 
> > How much do we care about the size of stuff in windows-3rd-party? Is it
> > better to just copy the whole windows release in there for simplicity /
> > reproducibility or should I trim it down to the necessities?
> 
> I trim quite a bit, basically just down to headers, link libraries and DLLs:
> (oh and the CMake mdoules) for most things this has proved acceptable.
> Ideally it would be a GIT-LFS repo but SourceForge can’t, and nothing in
> the repo changes more than once per year, so we’re getting away with it.
> (Also compared to FGData which really breaks stuff….(

Okay cool.

If I leave just headers, win32 and x64 static libs, cmake files, and API layer
DLLs (of questionable value), its down 9.1M.

Then I presume it's as simple as the below change in fgmeta to allow it to be
found.

I'll try this when I get a chance in a few weeks, but if anybody wants to try
it in the mean time on Windows be my guest.

Thanks
James Hogan

commit 92b74bd08ef95b09ab3d86af52b169ca26238cf0 (HEAD -> next)
Author: James Hogan <ja...@al...>
Date:   Fri Aug 12 12:02:41 2022 +0100

    Windows: Point FG to OpenXR loader in windows-3rd-party
    
    Point the flightgear cmake to the OpenXR loader binaries included in
    windows-3rd-party.

diff --git a/build_release_windows.bat b/build_release_windows.bat
index 0fb30f6..70a3737 100755
--- a/build_release_windows.bat
+++ b/build_release_windows.bat
@@ -35,6 +35,7 @@ cd ..\build-fg64
 cmake ..\flightgear -G %VSGEN%  -A x64 ^
                     -DMSVC_3RDPARTY_ROOT=%WORKSPACE%/windows-3rd-party/msvc140 ^
                     -DBOOST_ROOT=%WORKSPACE%/windows-3rd-party ^
+                    -DOpenXR_DIR=%WORKSPACE%/windows-3rd-party/openxr_loader/ ^
                     -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc140-64 ^
                     -DCMAKE_PREFIX_PATH=%QT5SDK64%;%OSG64% ^
                     -DOSG_FSTREAM_EXPORT_FIXED=1 ^


Diff stat of windows-3rd-party:

commit f92d4b5fc2c3f7cbb6391a23e8313f4e49d01c6e (HEAD -> openxr)
Author: James Hogan <ja...@al...>
Date:   Fri Aug 12 11:32:20 2022 +0100

    Add OpenXR loader 1.0.24
    
    Add official windows binaries for the OpenXR loader version 1.0.24 from:
    https://github.com/KhronosGroup/OpenXR-SDK-Source/releases/release-1.0.24
    
    The following files have been removed to trim down the size:
     - PDB debug files (openxr_loader.pdb)
     - Executables (hello_xr.exe, openxr_runtime_list.exe)
     - Dynamic version of OpenXR loader (openxr_loader.dll)
     - *_uwp variants (leaving just Win32 and x64)
    
    This leaves just CMake files, headers, API layers (DLLs and JSON), and
    OpenXR loader static libraries.

 openxr_loader/OpenXRConfig.cmake                                        |   25 +
 openxr_loader/OpenXRConfigVersion.cmake                                 |   25 +
 openxr_loader/Win32/bin/api_layers/XrApiLayer_api_dump.dll              |  Bin 0 -> 1725440 bytes
 openxr_loader/Win32/bin/api_layers/XrApiLayer_api_dump.json             |   10 +
 openxr_loader/Win32/bin/api_layers/XrApiLayer_core_validation.dll       |  Bin 0 -> 1803264 bytes
 openxr_loader/Win32/bin/api_layers/XrApiLayer_core_validation.json      |   10 +
 openxr_loader/Win32/lib/cmake/openxr/OpenXRConfig.cmake                 |   39 ++
 openxr_loader/Win32/lib/cmake/openxr/OpenXRConfigVersion.cmake          |   70 +++
 openxr_loader/Win32/lib/cmake/openxr/OpenXRTargets-relwithdebinfo.cmake |   19 +
 openxr_loader/Win32/lib/cmake/openxr/OpenXRTargets.cmake                |  107 ++++
 openxr_loader/Win32/lib/openxr_loader.lib                               |  Bin 0 -> 15638 bytes
 openxr_loader/include/openxr/openxr.h                                   | 4560 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 openxr_loader/include/openxr/openxr_platform.h                          |  690 ++++++++++++++++++++++++
 openxr_loader/include/openxr/openxr_platform_defines.h                  |  110 ++++
 openxr_loader/include/openxr/openxr_reflection.h                        | 3144 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 openxr_loader/x64/bin/api_layers/XrApiLayer_api_dump.dll                |  Bin 0 -> 2668032 bytes
 openxr_loader/x64/bin/api_layers/XrApiLayer_api_dump.json               |   10 +
 openxr_loader/x64/bin/api_layers/XrApiLayer_core_validation.dll         |  Bin 0 -> 2800640 bytes
 openxr_loader/x64/bin/api_layers/XrApiLayer_core_validation.json        |   10 +
 openxr_loader/x64/lib/cmake/openxr/OpenXRConfig.cmake                   |   39 ++
 openxr_loader/x64/lib/cmake/openxr/OpenXRConfigVersion.cmake            |   70 +++
 openxr_loader/x64/lib/cmake/openxr/OpenXRTargets-relwithdebinfo.cmake   |   19 +
 openxr_loader/x64/lib/cmake/openxr/OpenXRTargets.cmake                  |  107 ++++
 openxr_loader/x64/lib/openxr_loader.lib                                 |  Bin 0 -> 14596 bytes
 24 files changed, 9064 insertions(+)