Update for new USVFS function scheme. (#2044)

* Update for new USVFS function scheme.
* Fix call to usvfsVersionString().
* Move USVFS to mo2 dependencies instead of third party in CI.

1 files changed, 1 insertions, 22 deletions

diff --git a/src/shared/util.cpp b/src/shared/util.cpp
index c3b4d7aa..55a76c23 100644
--- a/src/shared/util.cpp
+++ b/src/shared/util.cpp
@@ -246,31 +246,10 @@ VersionInfo createVersionInfo()
 
 QString getUsvfsDLLVersion()
 {
-  // once 2.2.2 is released, this can be changed to call USVFSVersionString()
-  // directly; until then, using GetProcAddress() allows for mixing up devbuilds
-  // and usvfs dlls
-
-  using USVFSVersionStringType = const char* WINAPI();
-
-  QString s;
-
-  const auto m = ::LoadLibraryW(L"usvfs_x64.dll");
-
-  if (m) {
-    auto* f = reinterpret_cast<USVFSVersionStringType*>(
-        ::GetProcAddress(m, "USVFSVersionString"));
-
-    if (f) {
-      s = f();
-    }
-
-    ::FreeLibrary(m);
-  }
-
+  QString s = usvfsVersionString();
   if (s.isEmpty()) {
     s = "?";
   }
-
   return s;
 }