Working in UE4

Jordonbc · May 31, 2024 · daa49af · daa49af
1 parent f25ca44
commit daa49af
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 73 deletions.
diff --git a/.gitignore b/.gitignore
@@ -26,3 +26,4 @@ winbuild/
 
 !Compile.sh
 !Compile.bat
+HarmonyLinkLib/.vscode/
diff --git a/HarmonyLinkLib/CMakeLists.txt b/HarmonyLinkLib/CMakeLists.txt
@@ -69,7 +69,6 @@ set(COMMON_SOURCES
     "src/Platform/IPlatformUtilities.cpp"
     "src/HarmonyLinkLib.cpp"
     "src/Version.cpp"
-    "src/dllmain.cpp"
     "src/Platform/WineUtilities.cpp"
     "src/Utilities.cpp"
 )

diff --git a/HarmonyLinkLib/include/HarmonyLinkLib.h b/HarmonyLinkLib/include/HarmonyLinkLib.h
@@ -44,17 +44,19 @@ class IPlatformUtilities;
 
 namespace HarmonyLinkLib
 {
-    extern "C" HARMONYLINKLIB_API bool get_is_wine();
+    HARMONYLINKLIB_API bool HL_Init();
 
-    extern "C" HARMONYLINKLIB_API bool get_is_linux();
+    HARMONYLINKLIB_API bool get_is_wine();
 
-    extern "C" HARMONYLINKLIB_API bool get_is_docked();
+    HARMONYLINKLIB_API bool get_is_linux();
 
-    extern "C" HARMONYLINKLIB_API FCPUInfo* get_cpu_info();
+    HARMONYLINKLIB_API bool get_is_docked();
 
-    extern "C" HARMONYLINKLIB_API FDevice* get_device_info();
+    HARMONYLINKLIB_API FCPUInfo* get_cpu_info();
 
-    extern "C" HARMONYLINKLIB_API FOSVerInfo* get_os_version();
+    HARMONYLINKLIB_API FDevice* get_device_info();
+
+    HARMONYLINKLIB_API FOSVerInfo* get_os_version();
 
-    extern "C" HARMONYLINKLIB_API FBattery* get_battery_status();
+    HARMONYLINKLIB_API FBattery* get_battery_status();
 }
diff --git a/HarmonyLinkLib/src/HarmonyLinkLib.cpp b/HarmonyLinkLib/src/HarmonyLinkLib.cpp
@@ -16,10 +16,19 @@
 
 #include <iostream>
 #include "Platform/IPlatformUtilities.h"
+#include "Version.h"
 
 namespace HarmonyLinkLib
 {
-    std::shared_ptr<IPlatformUtilities> PlatformUtilities = IPlatformUtilities::GetInstance();
+    std::shared_ptr<IPlatformUtilities> PlatformUtilities = nullptr;
+
+    bool HL_Init()
+    {
+        std::wcout << "HarmonyLink V" << version::ToString().c_str() << " Copyright (C) 2023 Jordon Brooks\n";
+        PlatformUtilities = IPlatformUtilities::GetInstance();
+
+        return PlatformUtilities != nullptr;
+    }
 
     bool get_is_wine()
     {
@@ -92,8 +101,6 @@ namespace HarmonyLinkLib
 
     FOSVerInfo* get_os_version()
     {
-
-
         if (!PlatformUtilities)
         {
             std::wcout << "Failed to get platform utilities!\n";

diff --git a/HarmonyLinkLib/src/dllmain.cpp b/HarmonyLinkLib/src/dllmain.cpp
diff --git a/HarmonyLinkTest/src/main.cpp b/HarmonyLinkTest/src/main.cpp
@@ -85,10 +85,18 @@ void checkForQuit() {
 
 int main()
 {
-    std::cout << "Hello, World!" << '\n';
+    std::cout << "Hello, World!\n";
 
     std::thread inputThread(checkForQuit);
 
+    if (!HarmonyLinkLib::HL_Init())
+    {
+        std::cout << "Failed to init HarmonyLinkLib\n";
+        return 1;
+    }
+
+    std::cout << "HarmonyLinkLib successfully initialised!\n";
+
     const bool isWine = HarmonyLinkLib::get_is_wine();
     const char* test = isWine ? "is" : "isn't";