fix: Enable steam integration in standalone windows builds.

Author: paulhazen

Assets/Plugins/Windows/x64/DynamicLibraryLoaderHelper-x64.dll

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b2566815097f8df84c3481ef36648226a4f184744154e19335eb58b643c53f15
+oid sha256:52a3eb89f83ef7b4c9f5778cda651d57c9e991ffadf9dfc2ac27815f93e96aaf
 size 122880

Assets/Plugins/Windows/x64/GfxPluginNativeRender-x64.dll

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5984497fc9cb68e8dd2d25dc8e6fe45b8322d282f88b82b1bfe6eea3c10d7732
-size 592896
+oid sha256:a312eb5588ecde5e82b4a6cc572fda32813ca09b0c8dc6cfeacf46b029ee161d
+size 603648

Assets/Plugins/Windows/x86/DynamicLibraryLoaderHelper-x86.dll

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1926250dbc34f8519f4fab17ca42aea9808bbd6472fe7f6490bf4a40fe7fb7ed
+oid sha256:3cb9944297474f09fbab125aa7650d4f493b668c635da4eab0f5a8b0ad5e1482
 size 87040

Assets/Plugins/Windows/x86/GfxPluginNativeRender-x86.dll

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:feb614c1f35aa2339572866a481cb293924701dd3970922170537cd518f1743a
-size 457728
+oid sha256:aee2e3184efe8305ea97f61d80c16b168d90564e10846e7e3c3dd4e7b132345f
+size 466944

lib/NativeCode/DynamicLibraryLoaderHelper/Directory.Build.props

@@ -21,6 +21,7 @@
       -->
     <SolutionDirForwardSlashes>$(SolutionDir.Replace('\', '/'))</SolutionDirForwardSlashes>
     <UnityStreamingAssetsDirectory>$(SolutionDirForwardSlashes)../../../Assets/StreamingAssets/</UnityStreamingAssetsDirectory>
-    <OutputUnityAssetsDirectory>$(SolutionDir)..\..\..\Assets\Plugins\Windows\$(NormalizedPlatform)\</OutputUnityAssetsDirectory>
+    <SteamLibraryDirectory>$(SolutionDirForwardSlashes)../../../Library/PackageCache/com.rlabrecque.steamworks.net*/Plugins/</SteamLibraryDirectory>
+    <OutputUnityAssetsDirectory>$(SolutionDirForwardSlashes)../../../Assets/Plugins/Windows/$(NormalizedPlatform)/</OutputUnityAssetsDirectory>
   </PropertyGroup>
 </Project>

lib/NativeCode/DynamicLibraryLoaderHelper/NativeRender/NativeRender.vcxproj

@@ -83,21 +83,23 @@
     <PreBuildEvent>
       <!-- When debugging, make sure to copy the EOSSDK Dll to the output directory -->
       <Command>
-        @echo Copying "$(OutputUnityAssetsDirectory)$(SdkDllName)" to "$(TargetDir)"
-        copy "$(OutputUnityAssetsDirectory)$(SdkDllName)" "$(TargetDir)" /Y
-      </Command>
+@echo Copying "$(OutputUnityAssetsDirectory)$(SdkDllName)" to "$(TargetDir)"
+copy "$(OutputUnityAssetsDirectory)$(SdkDllName)" "$(TargetDir)" /Y
+
+@echo Copying "$(SteamLibraryDirectory)steam_api*.dll" to "$(TargetDir)"
+powershell -NoProfile -ExecutionPolicy Bypass -Command "try { Get-ChildItem -Path '$(SteamLibraryDirectory)steam_api*.dll' -Recurse | Copy-Item -Destination '$(TargetDir)' -Force } catch { Write-Error $_; exit 1 }"
+
+@echo Copying "$(SolutionDirForwardSlashes)../../../steam_appid.txt" "$(TargetDir)"
+xcopy "$(SolutionDirForwardSlashes)../../../steam_appid.txt" "$(TargetDir)" /Y
+</Command>
     </PreBuildEvent>
     <PostBuildEvent>
       <!-- Copy the meta file stored in the solution directory, since it's values have been properly set in such a way that Unity interacts with the DLL in the intended manner. -->
-      <Command>
-        @echo Copying "$(SolutionDir)$(ProjectName)-$(NormalizedPlatform).dll.meta" to "$(OutputUnityAssetsDirectory)"
-        copy $(SolutionDir)$(ProjectName)-$(NormalizedPlatform).dll.meta $(OutputUnityAssetsDirectory) /Y
-      </Command>
+      <Command>@echo Copying "$(SolutionDir)$(ProjectName)-$(NormalizedPlatform).dll.meta" to "$(OutputUnityAssetsDirectory)"
+copy $(SolutionDir)$(ProjectName)-$(NormalizedPlatform).dll.meta $(OutputUnityAssetsDirectory) /Y</Command>
       <!-- Copy the output files into the appropriate assets directory alongside the aforementioned .dll.meta file.-->
-      <Command>
-        @echo Copying "$(TargetDir)$(ProjectName)-$(NormalizedPlatform)*" to "$(OutputUnityAssetsDirectory)"
-        copy "$(TargetDir)$(ProjectName)*" "$(OutputUnityAssetsDirectory)" /Y
-      </Command>
+      <Command>@echo Copying "$(TargetDir)$(ProjectName)-$(NormalizedPlatform)*" to "$(OutputUnityAssetsDirectory)"
+copy "$(TargetDir)$(ProjectName)*" "$(OutputUnityAssetsDirectory)" /Y</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">

lib/NativeCode/DynamicLibraryLoaderHelper/NativeRender/include/Config/SteamConfig.hpp

@@ -107,15 +107,18 @@ namespace pew::eos::config
             steam_sdk_major_version(0),
             steam_sdk_minor_version(0)
         {
-            // TODO: Restore STEAM_SDK_DLL_NAME
-            //_library_path = common::get_path_relative_to_current_module(STEAM_SDK_DLL_NAME);
+            _library_path = io_helpers::get_path_relative_to_current_module(STEAM_SDK_DLL_NAME);
         }
 
         void parse_json_element(const std::string& name, json_value_s& value) override
         {
             if (name == "overrideLibraryPath")
             {
-              // TODO: Make sure this is applied appropriately.
+              const char* path = json_value_as_string(&value)->string;
+              if (!string_helpers::is_empty_or_whitespace(path))
+              {
+                  _library_path = path;
+              }
             }
             else if (name == "steamSDKMajorVersion")
             {

lib/NativeCode/DynamicLibraryLoaderHelper/NativeRender/include/string_helpers.h

@@ -146,5 +146,12 @@ namespace pew::eos::string_helpers
      * @return A UTF-8 encoded `std::string` representation of the path.
      */
     std::string to_utf8_str(const std::filesystem::path& path);
+
+    /**
+     * @brief Determines if a given C string is either empty or contains only whitespace characters.
+     * @param str The string to check.
+     * @return True if the string is empty or contains only whitespace characters.
+     */
+    bool is_empty_or_whitespace(const char* str);
 }
 #endif

lib/NativeCode/DynamicLibraryLoaderHelper/NativeRender/pch.h

@@ -33,6 +33,12 @@
 #include "eos_sdk.h"
 #include "Windows/eos_Windows.h"
 
+#if _WIN64
+#define STEAM_SDK_DLL_NAME "steam_api64.dll"
+#elif _WIN32
+#define STEAM_SDK_DLL_NAME "steam_api.dll"
+#endif
+
 #define SHOW_DIALOG_BOX_ON_WARN 0
 #define ENABLE_DLL_BASED_EOS_CONFIG 1
 #define XAUDIO2_DLL_NAME "xaudio2_9redist.dll"

lib/NativeCode/DynamicLibraryLoaderHelper/NativeRender/src/eos_helpers.cpp

@@ -250,19 +250,19 @@ namespace pew::eos
 
         // Get a pointer to the SteamAPI_Init function within the steam
         // library.
-        const auto SteamAPI_Init = pew::eos::eos_library_helpers::load_function_with_name<SteamAPI_Init_t>(steam_dll_handle, "SteamAPI_Init");
+        const auto SteamAPI_Init_Fn = pew::eos::eos_library_helpers::load_function_with_name<SteamAPI_Init_t>(steam_dll_handle, "SteamAPI_InitSafe");
 
         // If the SteamAPI_Init function pointer is null, then it was not
         // correctly retrieved from the steam library. Log an error and stop
-        if (SteamAPI_Init == nullptr)
+        if (SteamAPI_Init_Fn == nullptr)
         {
             logging::log_error(
                 "Could not load a pointer to the SteamAPI_Init "
                 "function within the loaded steam library handle.");
             return;
         }
 
-        if (SteamAPI_Init())
+        if (SteamAPI_Init_Fn())
         {
             logging::log_inform("SteamAPI_Init returned true. "
                 "Steam has been initialized.");
@@ -373,7 +373,7 @@ namespace pew::eos
 
         platform_options.RTCOptions = platform_config.get_platform_rtc_options().get();
 
-        // TODO-STEAM: enable apply_steam_settings(platform_options);
+        apply_steam_settings(platform_options);
 
         return platform_options;
     }