From 0e32f20836e0941b80b4958d5736b54191cf83e8 Mon Sep 17 00:00:00 2001
From: Jonathan Wendt <wendt@vr.rwth-aachen.de>
Date: Thu, 13 Dec 2018 09:47:07 +0100
Subject: [PATCH] use correct Linux link libraries for quat and vrpn
---
Source/DisplayCluster/DisplayCluster.Build.cs | 8 ++++----
.../Vrpn/Lib/Linux/{libquat.lib => libquat.a} | Bin
.../Vrpn/Lib/Linux/{libvrpn.lib => libvrpn.a} | Bin
3 files changed, 4 insertions(+), 4 deletions(-)
rename ThirdParty/Vrpn/Lib/Linux/{libquat.lib => libquat.a} (100%)
rename ThirdParty/Vrpn/Lib/Linux/{libvrpn.lib => libvrpn.a} (100%)
diff --git a/Source/DisplayCluster/DisplayCluster.Build.cs b/Source/DisplayCluster/DisplayCluster.Build.cs
index 4fc4726..bddd5b5 100644
--- a/Source/DisplayCluster/DisplayCluster.Build.cs
+++ b/Source/DisplayCluster/DisplayCluster.Build.cs
@@ -129,12 +129,12 @@ public class DisplayCluster : ModuleRules
}
else if (ROTargetRules.Platform == UnrealTargetPlatform.Linux)
{
- string LibrariesPath = Path.Combine(ThirdPartyPath, "VRPN", "Lib/Linux");
+ string LibrariesPath = Path.Combine(ThirdPartyPath, "Vrpn", "Lib/Linux");
- PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "libvrpn.lib"));
- PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "libquat.lib"));
+ PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "libvrpn.a"));
+ PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "libquat.a"));
- PublicIncludePaths.Add(Path.Combine(ThirdPartyPath, "VRPN", "Include"));
+ PublicIncludePaths.Add(Path.Combine(ThirdPartyPath, "Vrpn", "Include"));
PublicIncludePaths.Add(Path.Combine(ThirdPartyPath, "X11", "Include")); // Necessary for hardware swap sync.
return true;
diff --git a/ThirdParty/Vrpn/Lib/Linux/libquat.lib b/ThirdParty/Vrpn/Lib/Linux/libquat.a
similarity index 100%
rename from ThirdParty/Vrpn/Lib/Linux/libquat.lib
rename to ThirdParty/Vrpn/Lib/Linux/libquat.a
diff --git a/ThirdParty/Vrpn/Lib/Linux/libvrpn.lib b/ThirdParty/Vrpn/Lib/Linux/libvrpn.a
similarity index 100%
rename from ThirdParty/Vrpn/Lib/Linux/libvrpn.lib
rename to ThirdParty/Vrpn/Lib/Linux/libvrpn.a
--
GitLab