From 5e8a775fa7d6c90e08f745415ed029c8e5f78158 Mon Sep 17 00:00:00 2001 From: "j.foucher" Date: Wed, 6 May 2026 07:31:11 +0200 Subject: [PATCH] Consolidate Vive SDK lib + DLLs under ThirdParty/VBS_SDK/Win64/ Why: vendor SDKs distributed inside UE plugins typically ship a single folder per platform rather than the Unix-style include/lib/bin split. Grouping VS_PC_SDK.lib alongside the three runtime DLLs matches what HTC and most XR SDKs publish and keeps the layout closer to what a maintainer expects when dropping in a new SDK release. - Move VS_PC_SDK.lib from lib/Win64/ into Win64/ alongside the DLLs. - Remove the now-empty lib/ and bin/ subdirectories. - Update Build.cs to use a single Win64Dir variable. - Update FilterPlugin.ini to reference the consolidated path. Validated by clean rebuilds of PS_ViveVBSEditor and PS_ViveVBS Win64 Development targets, both exit 0 with the three DLLs auto-copied next to the binary. Co-Authored-By: Claude Opus 4.7 (1M context) --- .../Plugins/PS_ViveVBS/Config/FilterPlugin.ini | 3 +-- .../PS_ViveVBS/Source/ViveVBS/ViveVBS.Build.cs | 7 +++---- .../VBS_SDK/{bin => }/Win64/RRServerManageAPI.dll | Bin .../{bin => }/Win64/VSWPipeVarClient64U_MT.dll | Bin .../VBS_SDK/{bin => }/Win64/VS_PC_SDK.dll | Bin .../VBS_SDK/{lib => }/Win64/VS_PC_SDK.lib | Bin 6 files changed, 4 insertions(+), 6 deletions(-) rename Unreal/PS_ViveVBS/Plugins/PS_ViveVBS/ThirdParty/VBS_SDK/{bin => }/Win64/RRServerManageAPI.dll (100%) rename Unreal/PS_ViveVBS/Plugins/PS_ViveVBS/ThirdParty/VBS_SDK/{bin => }/Win64/VSWPipeVarClient64U_MT.dll (100%) rename Unreal/PS_ViveVBS/Plugins/PS_ViveVBS/ThirdParty/VBS_SDK/{bin => }/Win64/VS_PC_SDK.dll (100%) rename Unreal/PS_ViveVBS/Plugins/PS_ViveVBS/ThirdParty/VBS_SDK/{lib => }/Win64/VS_PC_SDK.lib (100%) diff --git a/Unreal/PS_ViveVBS/Plugins/PS_ViveVBS/Config/FilterPlugin.ini b/Unreal/PS_ViveVBS/Plugins/PS_ViveVBS/Config/FilterPlugin.ini index 472eb1b..a3d895f 100644 --- a/Unreal/PS_ViveVBS/Plugins/PS_ViveVBS/Config/FilterPlugin.ini +++ b/Unreal/PS_ViveVBS/Plugins/PS_ViveVBS/Config/FilterPlugin.ini @@ -3,5 +3,4 @@ ; may include "...", "*", and "?" wildcards to match directories, files, and individual characters respectively. /ThirdParty/VBS_SDK/include/... -/ThirdParty/VBS_SDK/lib/Win64/... -/ThirdParty/VBS_SDK/bin/Win64/... +/ThirdParty/VBS_SDK/Win64/... diff --git a/Unreal/PS_ViveVBS/Plugins/PS_ViveVBS/Source/ViveVBS/ViveVBS.Build.cs b/Unreal/PS_ViveVBS/Plugins/PS_ViveVBS/Source/ViveVBS/ViveVBS.Build.cs index 43cac0f..8a5b8e1 100644 --- a/Unreal/PS_ViveVBS/Plugins/PS_ViveVBS/Source/ViveVBS/ViveVBS.Build.cs +++ b/Unreal/PS_ViveVBS/Plugins/PS_ViveVBS/Source/ViveVBS/ViveVBS.Build.cs @@ -25,11 +25,10 @@ public class ViveVBS : ModuleRules { string SdkRoot = Path.Combine(PluginDirectory, "ThirdParty", "VBS_SDK"); string IncludeDir = Path.Combine(SdkRoot, "include"); - string LibDir = Path.Combine(SdkRoot, "lib", "Win64"); - string BinDir = Path.Combine(SdkRoot, "bin", "Win64"); + string Win64Dir = Path.Combine(SdkRoot, "Win64"); PrivateIncludePaths.Add(IncludeDir); - PublicAdditionalLibraries.Add(Path.Combine(LibDir, "VS_PC_SDK.lib")); + PublicAdditionalLibraries.Add(Path.Combine(Win64Dir, "VS_PC_SDK.lib")); string[] Dlls = { @@ -42,7 +41,7 @@ public class ViveVBS : ModuleRules { RuntimeDependencies.Add( Path.Combine("$(BinaryOutputDir)", Dll), - Path.Combine(BinDir, Dll), + Path.Combine(Win64Dir, Dll), StagedFileType.NonUFS); } } diff --git a/Unreal/PS_ViveVBS/Plugins/PS_ViveVBS/ThirdParty/VBS_SDK/bin/Win64/RRServerManageAPI.dll b/Unreal/PS_ViveVBS/Plugins/PS_ViveVBS/ThirdParty/VBS_SDK/Win64/RRServerManageAPI.dll similarity index 100% rename from Unreal/PS_ViveVBS/Plugins/PS_ViveVBS/ThirdParty/VBS_SDK/bin/Win64/RRServerManageAPI.dll rename to Unreal/PS_ViveVBS/Plugins/PS_ViveVBS/ThirdParty/VBS_SDK/Win64/RRServerManageAPI.dll diff --git a/Unreal/PS_ViveVBS/Plugins/PS_ViveVBS/ThirdParty/VBS_SDK/bin/Win64/VSWPipeVarClient64U_MT.dll b/Unreal/PS_ViveVBS/Plugins/PS_ViveVBS/ThirdParty/VBS_SDK/Win64/VSWPipeVarClient64U_MT.dll similarity index 100% rename from Unreal/PS_ViveVBS/Plugins/PS_ViveVBS/ThirdParty/VBS_SDK/bin/Win64/VSWPipeVarClient64U_MT.dll rename to Unreal/PS_ViveVBS/Plugins/PS_ViveVBS/ThirdParty/VBS_SDK/Win64/VSWPipeVarClient64U_MT.dll diff --git a/Unreal/PS_ViveVBS/Plugins/PS_ViveVBS/ThirdParty/VBS_SDK/bin/Win64/VS_PC_SDK.dll b/Unreal/PS_ViveVBS/Plugins/PS_ViveVBS/ThirdParty/VBS_SDK/Win64/VS_PC_SDK.dll similarity index 100% rename from Unreal/PS_ViveVBS/Plugins/PS_ViveVBS/ThirdParty/VBS_SDK/bin/Win64/VS_PC_SDK.dll rename to Unreal/PS_ViveVBS/Plugins/PS_ViveVBS/ThirdParty/VBS_SDK/Win64/VS_PC_SDK.dll diff --git a/Unreal/PS_ViveVBS/Plugins/PS_ViveVBS/ThirdParty/VBS_SDK/lib/Win64/VS_PC_SDK.lib b/Unreal/PS_ViveVBS/Plugins/PS_ViveVBS/ThirdParty/VBS_SDK/Win64/VS_PC_SDK.lib similarity index 100% rename from Unreal/PS_ViveVBS/Plugins/PS_ViveVBS/ThirdParty/VBS_SDK/lib/Win64/VS_PC_SDK.lib rename to Unreal/PS_ViveVBS/Plugins/PS_ViveVBS/ThirdParty/VBS_SDK/Win64/VS_PC_SDK.lib