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

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

Hi,

On Friday, 12 August 2022 13:38:26 BST James Turner wrote:
> > On 12 Aug 2022, at 12:30, James Hogan <ja...@al...> wrote:
> > 
> > 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.
> 
> Don’t bother with 32-bit libs, all future will be x64 only.

Okay thanks. A quick update:
* I've fixed the windows+osgXR build breakage (apparent preprocessor pollution
on Windows necessitates changing osgXR::Settings::OPAQUE ->
osgXR::Settings::BLEND_MODE_OPAQUE, which is a source API change, and ancient
OpenGL headers bit again).
* I've rearranged my windows-3rd-party patch a bit, to put it all in
msvc140/3rdParty.x64/ so its picked up automatically by the flightgear build
(needing tweaks to paths in the cmake files). Unfortunately it does seem to
need the main openxr_loader.dll to run so I've included that (<2MB) and added
it to the windows installer. Diff [--stat] below.

I'll push osgXR 0.5.0 when I'm happy with it, and update
flightgear/3rdparty/osgXR to match, then if there are no objections I'll try
pushing the openxr loader to windows-3rd-party and fgmeta.

Cheers
James

windows-3rd-party diff --stat:

commit b1d11c81e01e9f1e104252a71e5ce3eb284ed2e4
Author: James Hogan <ja...@al...>
Date:   Wed Aug 17 21:54:47 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
    
    This will allow VR support to be automatically enabled on Windows
    builds.
    
    Only the following files have been included, to trim down the size:
    - Generic headers (placed in 3rdParty.x64/include/ for consistency).
    - x64 CMake files.
    - x64 DLL and static library files for OpenXR loader (both are included
      as they seem to be required).
    
    CMake files have been modified to point at the correct path of the
    static library & DLL, as well as the include directory.

 msvc140/3rdParty.x64/bin/openxr_loader.dll         |  Bin 0 -> 1941504 bytes
 msvc140/3rdParty.x64/include/openxr/openxr.h       | 4560 ++++++++++++++++++++
 .../3rdParty.x64/include/openxr/openxr_platform.h  |  690 +++
 .../include/openxr/openxr_platform_defines.h       |  110 +
 .../include/openxr/openxr_reflection.h             | 3144 ++++++++++++++
 .../lib/cmake/openxr/OpenXRConfig.cmake            |   39 +
 .../lib/cmake/openxr/OpenXRConfigVersion.cmake     |   70 +
 .../openxr/OpenXRTargets-relwithdebinfo.cmake      |   19 +
 .../lib/cmake/openxr/OpenXRTargets.cmake           |  107 +
 msvc140/3rdParty.x64/lib/openxr_loader.lib         |  Bin 0 -> 14596 bytes
 10 files changed, 8739 insertions(+)

fgmeta diff:

From 8966dcd73738d3dd8c626d23497a3ae4f4ae73f1 Mon Sep 17 00:00:00 2001
From: James Hogan <ja...@al...>
Date: Wed, 17 Aug 2022 21:59:42 +0100
Subject: [PATCH] Windows: Install openxr_loader.dll

Add openxr_loader.dll to the list of 3rd party DLLs that need
installing. The OpenXR loader is now included in windows-3rd-party,
allowing VR support to be enabled, which requires this file.
---
 FlightGear-files.iss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/FlightGear-files.iss b/FlightGear-files.iss
index e9baca4..feee869 100644
--- a/FlightGear-files.iss
+++ b/FlightGear-files.iss
@@ -12,6 +12,7 @@ Source: "{#ThirdPartyDir}\3rdParty.x64\bin\crashpad_handler.exe"; DestDir: "{app
 Source: "{#ThirdPartyDir}\3rdParty.x64\bin\dbus-1-3.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode
 Source: "{#ThirdPartyDir}\3rdParty.x64\bin\event_core.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode
 Source: "{#ThirdPartyDir}\3rdParty.x64\bin\liblzma.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode
+Source: "{#ThirdPartyDir}\3rdParty.x64\bin\openxr_loader.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode
 
 ; Include the base package
 #if IncludeData == "TRUE"
-- 
2.37.2