Merge branch 'release-2.0.2' into stable

PlayEveryWare · Aug 16, 2022 · 9c722f1 · 9c722f1
2 parents b552f6d + a3f1647
commit 9c722f1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/Assets/Plugins/Source/EOSManager_DynamicLoading.cs b/Assets/Plugins/Source/EOSManager_DynamicLoading.cs
@@ -88,6 +88,7 @@ public partial class EOSSingleton
                         [DllImport(GfxPluginNativeRenderPath,CallingConvention = CallingConvention.StdCall)]
                         static extern IntPtr EOS_GetPlatformInterface();
 
+                        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
                         delegate void PrintDelegateType(string str);
                         [DllImport(GfxPluginNativeRenderPath,CallingConvention = CallingConvention.StdCall)]
                         static extern void global_log_flush_with_function(IntPtr ptr);

diff --git a/EOSUnityPlugin_package_template/CHANGELOG.md b/EOSUnityPlugin_package_template/CHANGELOG.md
@@ -8,6 +8,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Removed
 ### Fixed
 
+## [2.0.2] - 2022-08-15
+
+### Fixed
+- Fixed function pointer size causing x86 crash when logging from native DLL.
+
 ## [2.0.1] - 2022-07-29
 
 ### Added

diff --git a/EOSUnityPlugin_package_template/package.json b/EOSUnityPlugin_package_template/package.json
@@ -1,6 +1,6 @@
 {
     "name": "com.playeveryware.eos",
-    "version": "2.0.1",
+    "version": "2.0.2",
     "unity": "2020.1",
     "unityRelease": "11f1",
     "displayName": "Epic Online Services Plugin for Unity",
@@ -21,6 +21,6 @@
         }
     ],
     "com_playeveryware": {
-        "git_build_sha": "19915039dec938030d389f90cf66d451d7f0daa6"
+        "git_build_sha": "bd27761494b5035811d92eb677c0cd338379e56f"
     }
 }