Merge branch 'release/V2.1' into Stable

.gitignore

@@ -16,4 +16,8 @@ build/**
 !Images/*
 !.github/**
 !HarmonyLinkLib/**
-!HarmonyLinkTest/**
+!HarmonyLinkTest/**
+
+# Blacklist specific build directories
+linuxbuild/
+build/

CMakeLists.txt

@@ -1,3 +1,16 @@
+# Copyright (c) 2024 Jordon Brooks
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 cmake_minimum_required(VERSION 3.10)
 project(HarmonyLinkProject)
 
@@ -14,6 +27,8 @@ else()
     message(STATUS "Building with unspecified build type")
 endif()
 
+add_compile_definitions($<$<CONFIG:Debug>:DEBUG_MODE>)
+
 #set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
 
 # Platform-specific definitions
@@ -55,7 +70,7 @@ add_subdirectory(HarmonyLinkTest)
 #add_executable(Testing ${TEST_SOURCES})
 
 # Set HarmonyLinkTest as the default startup project
-set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT HarmonyLinkTest)
+set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT HarmonyLinkTestShared)
 
 # Link Google Test and HarmonyLink library to the test executable
 #target_link_libraries(Testing gtest gtest_main gmock HarmonyLinkLib)

HarmonyLinkLib/CMakeLists.txt

@@ -1,5 +1,36 @@
+# Copyright (c) 2024 Jordon Brooks
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 cmake_minimum_required(VERSION 3.10)
-project(HarmonyLinkLib VERSION 2.0.0)
+project(HarmonyLinkLib VERSION 2.1.0)
+
+include(FetchContent)
+
+FetchContent_Declare(
+  fmt
+  GIT_REPOSITORY https://github.com/fmtlib/fmt.git
+  GIT_TAG 10.2.1 # Specify the desired version of {fmt}
+)
+
+FetchContent_MakeAvailable(fmt)
+if(NOT fmt_POPULATED)
+  FetchContent_Populate(fmt)
+  # Add fmt but exclude it from the ALL target, reducing IDE clutter
+  add_subdirectory(${fmt_SOURCE_DIR} ${fmt_BINARY_DIR} EXCLUDE_FROM_ALL)
+endif()
+
+set_target_properties(fmt PROPERTIES FOLDER External)
+set_target_properties(fmt PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
 
 # Find the current Git branch and the last commit timestamp
 find_package(Git QUIET)
@@ -27,13 +58,24 @@ configure_file(include/Version.h.in Version.generated.h)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED True)
 
+# Define metadata variables
+set(FILE_DESCRIPTION "Enhances handheld gaming with intelligent hardware recognition, dynamic adaptability, and robust API access for Windows and Linux, including Steam Deck and Wine support.")
+set(INTERNAL_NAME "HarmonyLinkLib")
+set(ORIGINAL_FILENAME "HarmonyLinkLib.dll")
+set(PRODUCT_NAME "HarmonyLinkLib")
+set(COMMENTS "")
+
+# Configure version.rc file for shared library
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Resources/Version.rc.in ${CMAKE_CURRENT_BINARY_DIR}/version.rc @ONLY)
+
 # Explicitly list source files
 set(COMMON_SOURCES
     "src/Platform/IPlatformUtilities.cpp"
     "src/HarmonyLinkLib.cpp"
     "src/Version.cpp"
     "src/dllmain.cpp"
     "src/Platform/WineUtilities.cpp"
+    "src/Utilities.cpp"
 )
 
 # Explicitly list include files
@@ -43,16 +85,15 @@ set(COMMON_INCLUDES
     "include/Structs/FOSVerInfo.h"
     "include/Structs/FDevice.h"
     "include/Structs/FCPUInfo.h"
-
     "include/Enums/EDevice.h"
     "include/Enums/EPlatform.h"
-
+    "include/Enums/ESteamDeck.h"
     "include/FString.h"
     "include/HarmonyLinkLib.h"
     "include/Version.h"
-
     "src/Platform/IPlatformUtilities.h"
     "src/Platform/WineUtilities.h"
+    "src/Utilities.h"
 )
 
 set(WINDOWS_SOURCES
@@ -88,42 +129,55 @@ if(WIN32)
     message(STATUS "Compiling for Windows...")
     list(APPEND LIB_SOURCES ${COMMON_SOURCES} ${WINDOWS_SOURCES})
     list(APPEND LIB_INCLUDES ${COMMON_INCLUDES} ${WINDOWS_INCLUDES})
+    list(APPEND SHARED_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
 elseif(UNIX)
-  message(STATUS "Compiling for Unix-based systems...")
-  if(APPLE)
-    message(STATUS "Compiling for Mac...")
-    list(APPEND LIB_SOURCES ${COMMON_SOURCES} ${MAC_SOURCES})
-    list(APPEND LIB_INCLUDES ${COMMON_INCLUDES} ${MAC_INCLUDES})
-  else()
-    message(STATUS "Compiling for Linux...")
-    list(APPEND LIB_SOURCES ${COMMON_SOURCES} ${LINUX_SOURCES})
-    list(APPEND LIB_INCLUDES ${COMMON_INCLUDES} ${LINUX_INCLUDES})
-  endif()
+    message(STATUS "Compiling for Unix-based systems...")
+    if(APPLE)
+        message(STATUS "Compiling for Mac...")
+        list(APPEND LIB_SOURCES ${COMMON_SOURCES} ${MAC_SOURCES})
+        list(APPEND LIB_INCLUDES ${COMMON_INCLUDES} ${MAC_INCLUDES})
+    else()
+        message(STATUS "Compiling for Linux...")
+        list(APPEND LIB_SOURCES ${COMMON_SOURCES} ${LINUX_SOURCES})
+        list(APPEND LIB_INCLUDES ${COMMON_INCLUDES} ${LINUX_INCLUDES})
+    endif()
 endif()
 
-# Add library
-add_library(HarmonyLinkLib SHARED ${LIB_SOURCES} ${LIB_INCLUDES})
-
-target_include_directories(HarmonyLinkLib 
+# Create the shared library
+add_library(HarmonyLinkLibShared SHARED ${LIB_SOURCES} ${SHARED_SOURCES})
+target_include_directories(HarmonyLinkLibShared 
     PRIVATE 
         "${PROJECT_SOURCE_DIR}/src"
     PUBLIC 
         "${PROJECT_BINARY_DIR}"
         "${PROJECT_SOURCE_DIR}/include"
 )
+target_compile_definitions(HarmonyLinkLibShared PRIVATE HARMONYLINKLIB_SHARED)
 
-target_compile_definitions(HarmonyLinkLib PRIVATE HARMONYLINKLIB_EXPORTS)
-
-if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    target_compile_definitions(HarmonyLinkLib PRIVATE "DEBUG_MODE")
-endif()
+# Create the static library
+add_library(HarmonyLinkLibStatic STATIC ${LIB_SOURCES})
+target_include_directories(HarmonyLinkLibStatic 
+    PRIVATE 
+        "${PROJECT_SOURCE_DIR}/src"
+    PUBLIC 
+        "${PROJECT_BINARY_DIR}"
+        "${PROJECT_SOURCE_DIR}/include"
+)
+target_compile_definitions(HarmonyLinkLibStatic PRIVATE HARMONYLINKLIB_STATIC)
 
 # Set output directories for all build types
 foreach(TYPE IN ITEMS DEBUG RELEASE)
     string(TOUPPER ${TYPE} TYPE_UPPER)
-    set_target_properties(${PROJECT_NAME} PROPERTIES
-        RUNTIME_OUTPUT_DIRECTORY_${TYPE_UPPER} "${CMAKE_BINARY_DIR}/bin/${TYPE}/${PROJECT_NAME}"
-        LIBRARY_OUTPUT_DIRECTORY_${TYPE_UPPER} "${CMAKE_BINARY_DIR}/lib/${TYPE}/${PROJECT_NAME}"
-        ARCHIVE_OUTPUT_DIRECTORY_${TYPE_UPPER} "${CMAKE_BINARY_DIR}/archive/${TYPE}/${PROJECT_NAME}"
+    set_target_properties(HarmonyLinkLibShared PROPERTIES
+        RUNTIME_OUTPUT_DIRECTORY_${TYPE_UPPER} "${CMAKE_BINARY_DIR}/bin/${TYPE}/HarmonyLinkLib"
+        LIBRARY_OUTPUT_DIRECTORY_${TYPE_UPPER} "${CMAKE_BINARY_DIR}/lib/${TYPE}/HarmonyLinkLib"
+        ARCHIVE_OUTPUT_DIRECTORY_${TYPE_UPPER} "${CMAKE_BINARY_DIR}/archive/${TYPE}/HarmonyLinkLib"
+    )
+    set_target_properties(HarmonyLinkLibStatic PROPERTIES
+        ARCHIVE_OUTPUT_DIRECTORY_${TYPE_UPPER} "${CMAKE_BINARY_DIR}/archive/${TYPE}/HarmonyLinkLibStatic"
     )
 endforeach()
+
+# Link fmt library to both shared and static libraries
+target_link_libraries(HarmonyLinkLibShared PRIVATE fmt::fmt)
+target_link_libraries(HarmonyLinkLibStatic PRIVATE fmt::fmt)

HarmonyLinkLib/Resources/Version.rc.in

@@ -0,0 +1,49 @@
+// Copyright (c) 2024 Jordon Brooks
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//   http://www.apache.org/licenses/LICENSE-2.0
+
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include <windows.h>
+#include <winver.h>
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION @PROJECT_VERSION_MAJOR@,@PROJECT_VERSION_MINOR@,@PROJECT_VERSION_PATCH@,0
+ PRODUCTVERSION @PROJECT_VERSION_MAJOR@,@PROJECT_VERSION_MINOR@,@PROJECT_VERSION_PATCH@,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS VOS_NT_WINDOWS32
+ FILETYPE VFT_DLL
+ FILESUBTYPE 0x0L
+{
+    BLOCK "StringFileInfo"
+    {
+        BLOCK "040904b0"
+        {
+            VALUE "CompanyName", "N/A"
+            VALUE "FileDescription", "@FILE_DESCRIPTION@"
+            VALUE "FileVersion", "@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@[email protected]"
+            VALUE "InternalName", "@INTERNAL_NAME@"
+            VALUE "OriginalFilename", "@ORIGINAL_FILENAME@"
+            VALUE "ProductName", "@PRODUCT_NAME@"
+            VALUE "ProductVersion", "@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@[email protected]"
+            VALUE "Comments", "@COMMENTS@"
+            VALUE "LegalCopyright", "N/A"
+            VALUE "LegalTrademarks", "N/A"
+            VALUE "PrivateBuild", "N/A"
+            VALUE "SpecialBuild", "N/A"
+        }
+    }
+    BLOCK "VarFileInfo"
+    {
+        VALUE "Translation", 0x409, 1200
+    }
+}

HarmonyLinkLib/include/Core.h

@@ -16,10 +16,14 @@
 
 // Use a preprocessor definition to switch between export and import declarations
 #ifdef _WIN32
-    #ifdef HARMONYLINKLIB_EXPORTS
-        #define HARMONYLINKLIB_API __declspec(dllexport)
+    #ifdef HARMONYLINKLIB_STATIC
+        #define HARMONYLINKLIB_API
     #else
-        #define HARMONYLINKLIB_API __declspec(dllimport)
+        #ifdef HARMONYLINKLIB_SHARED
+            #define HARMONYLINKLIB_API __declspec(dllexport)
+        #else
+            #define HARMONYLINKLIB_API __declspec(dllimport)
+        #endif
     #endif
 #else
     #define HARMONYLINKLIB_API

HarmonyLinkLib/include/Enums/EDevice.h

@@ -21,6 +21,7 @@ namespace HarmonyLinkLib
 {
     enum class EDevice : uint8_t
     {
+        UNKNOWN,
         DESKTOP,
         LAPTOP,
         HANDHELD,

HarmonyLinkLib/include/Enums/EPlatform.h

@@ -21,6 +21,7 @@ namespace HarmonyLinkLib
 {
     enum class EPlatform : uint8_t
     {
+        UNKNOWN,
         WINDOWS,
         LINUX,
         MAC,

HarmonyLinkLib/include/Enums/ESteamDeck.h

@@ -0,0 +1,29 @@
+// Copyright (c) 2024 Jordon Brooks
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//   http://www.apache.org/licenses/LICENSE-2.0
+
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <cstdint>
+
+// Enum class for representing different types of devices
+namespace HarmonyLinkLib
+{
+    enum class ESteamDeck : uint8_t
+    {
+        NONE, // Device is not a steam deck
+        UNKNOWN, // Device is a steam deck but model cannot be determined
+        LCD,
+        OLED,
+    };
+}

HarmonyLinkLib/include/HarmonyLinkLib.h

@@ -46,6 +46,10 @@ namespace HarmonyLinkLib
 {
     extern "C" HARMONYLINKLIB_API bool get_is_wine();
 
+    extern "C" HARMONYLINKLIB_API bool get_is_linux();
+
+    extern "C" HARMONYLINKLIB_API bool get_is_docked();
+
     extern "C" HARMONYLINKLIB_API FCPUInfo* get_cpu_info();
 
     extern "C" HARMONYLINKLIB_API FDevice* get_device_info();

HarmonyLinkLib/include/Structs/FDevice.h

@@ -18,13 +18,15 @@
 
 #include "Enums/EDevice.h"
 #include "Enums/EPlatform.h"
+#include "Enums/ESteamDeck.h"
 
 namespace HarmonyLinkLib
 {
     // Struct to represent a specific device with both platform and device type
     struct FDevice : HarmonyLinkStruct
     {
-        EPlatform platform;
-        EDevice device;
+        EPlatform platform = EPlatform::UNKNOWN;
+        EDevice device = EDevice::UNKNOWN;
+        ESteamDeck steam_deck_model = ESteamDeck::NONE;
     };
 }

HarmonyLinkLib/include/Version.h.in

@@ -23,3 +23,7 @@
 
 #define GIT_BRANCH_NAME "@GIT_BRANCH_NAME@"
 #define GIT_COMMIT_TIMESTAMP "@GIT_COMMIT_TIMESTAMP@"
+
+
+#include <windows.h>
+#include <winver.h>

HarmonyLinkLib/src/HarmonyLinkLib.cpp

@@ -32,6 +32,28 @@ namespace HarmonyLinkLib
         return PlatformUtilities->is_running_under_wine();
     }
 
+    bool get_is_linux()
+    {
+        if (!PlatformUtilities)
+        {
+            std::wcout << "Failed to get platform utilities!\n";
+            return false;
+        }
+
+        return PlatformUtilities->is_linux();
+    }
+
+    bool get_is_docked()
+    {
+        if (!PlatformUtilities)
+        {
+            std::wcout << "Failed to get platform utilities!\n";
+            return false;
+        }
+
+        return PlatformUtilities->is_docked();
+    }
+
     FCPUInfo* get_cpu_info()
     {
         if (!PlatformUtilities)