Make it work one last time

Author: bitsandfoxes

package-dev/Plugins/sentry_utils.c package-dev/Plugins/PS5/sentry_utils.cpackage-dev/Plugins/sentry_utils.c renamed to package-dev/Plugins/PS5/sentry_utils.c

@@ -13,8 +13,8 @@
     <Csc
       Sources="@(Compile)"
       References="@(ReferencePath)"
-      OutputAssembly="$(OutDir)Sentry.Unity.Native.Console.dll"
-      DefineConstants="$(DefineConstants);SENTRY_NATIVE_STATIC"
+      OutputAssembly="$(OutDir)Sentry.Unity.Native.PlayStation.dll"
+      DefineConstants="$(DefineConstants);SENTRY_NATIVE_PLAYSTATION"
       TargetType="library"
       EmitDebugInformation="true"
     />

package-dev/Plugins/sentry_utils.c.meta …kage-dev/Plugins/PS5/sentry_utils.c.metapackage-dev/Plugins/sentry_utils.c.meta renamed to package-dev/Plugins/PS5/sentry_utils.c.meta package-dev/Plugins/sentry_utils.c.meta renamed to package-dev/Plugins/PS5/sentry_utils.c.meta

@@ -114,84 +114,40 @@ internal static string GetCacheDirectory(SentryUnityOptions options)
     internal static void ReinstallBackend() => sentry_reinstall_backend();
 
     // libsentry.so
-#if SENTRY_NATIVE_STATIC
-    [DllImport("__Internal")]
-#else
     [DllImport("sentry")]
-#endif
     private static extern IntPtr sentry_options_new();
 
-#if SENTRY_NATIVE_STATIC
-    [DllImport("__Internal")]
-#else
     [DllImport("sentry")]
-#endif
     private static extern void sentry_options_set_dsn(IntPtr options, string dsn);
 
-#if SENTRY_NATIVE_STATIC
-    [DllImport("__Internal")]
-#else
     [DllImport("sentry")]
-#endif
     private static extern void sentry_options_set_release(IntPtr options, string release);
 
-#if SENTRY_NATIVE_STATIC
-    [DllImport("__Internal")]
-#else
     [DllImport("sentry")]
-#endif
     private static extern void sentry_options_set_debug(IntPtr options, int debug);
 
-#if SENTRY_NATIVE_STATIC
-    [DllImport("__Internal")]
-#else
     [DllImport("sentry")]
-#endif
     private static extern void sentry_options_set_environment(IntPtr options, string environment);
 
-#if SENTRY_NATIVE_STATIC
-    [DllImport("__Internal")]
-#else
     [DllImport("sentry")]
-#endif
     private static extern void sentry_options_set_sample_rate(IntPtr options, double rate);
 
-#if SENTRY_NATIVE_STATIC
-    [DllImport("__Internal")]
-#else
     [DllImport("sentry")]
-#endif
     private static extern void sentry_options_set_database_path(IntPtr options, string path);
 
-#if SENTRY_NATIVE_STATIC
-    [DllImport("__Internal")]
-#else
     [DllImport("sentry")]
-#endif
     private static extern void sentry_options_set_database_pathw(IntPtr options, [MarshalAs(UnmanagedType.LPWStr)] string path);
 
-#if SENTRY_NATIVE_STATIC
-    [DllImport("__Internal")]
-#else
     [DllImport("sentry")]
-#endif
     private static extern void sentry_options_set_auto_session_tracking(IntPtr options, int debug);
 
-#if SENTRY_NATIVE_STATIC
-    [DllImport("__Internal")]
-#else
     [DllImport("sentry")]
-#endif
     private static extern void sentry_options_set_attach_screenshot(IntPtr options, int attachScreenshot);
 
     [UnmanagedFunctionPointer(CallingConvention.Cdecl, SetLastError = true)]
     private delegate void sentry_logger_function_t(int level, IntPtr message, IntPtr argsAddress, IntPtr userData);
 
-#if SENTRY_NATIVE_STATIC
-    [DllImport("__Internal")]
-#else
     [DllImport("sentry")]
-#endif
     private static extern void sentry_options_set_logger(IntPtr options, sentry_logger_function_t logger, IntPtr userData);
 
     // The logger we should forward native messages to. This is referenced by nativeLog() which in turn for.
@@ -287,11 +243,11 @@ private static void nativeLogImpl(int cLevel, IntPtr format, IntPtr args, IntPtr
         }
     }
 
-    // For Mono (Windows/Linux): use platform's native C library directly
-#if SENTRY_NATIVE_STATIC
+#if SENTRY_NATIVE_PLAYSTATION
     [DllImport("__Internal", EntryPoint = "vsnprintf_sentry")]
     private static extern int vsnprintf_sentry(IntPtr buffer, UIntPtr bufferSize, IntPtr format, IntPtr args);
 #else
+    // For Windows/Linux: use platform's native C library directly
     [DllImport("msvcrt", EntryPoint = "vsnprintf")]
     private static extern int vsnprintf_windows(IntPtr buffer, UIntPtr bufferSize, IntPtr format, IntPtr args);
 
@@ -301,7 +257,7 @@ private static void nativeLogImpl(int cLevel, IntPtr format, IntPtr args, IntPtr
 
     private static int vsnprintf(IntPtr buffer, UIntPtr bufferSize, IntPtr format, IntPtr args)
     {
-#if SENTRY_NATIVE_STATIC
+#if SENTRY_NATIVE_PLAYSTATION
         return vsnprintf_sentry(buffer, bufferSize, format, args);
 #else
         return _isWindows

package-dev/Runtime/Sentry.Unity.Native.PlayStation.dll.meta

@@ -1,7 +1,7 @@
 using System.Runtime.CompilerServices;
 
 [assembly: InternalsVisibleTo("Sentry.Unity.Native")]
-[assembly: InternalsVisibleTo("Sentry.Unity.Native.Console")]
+[assembly: InternalsVisibleTo("Sentry.Unity.Native.PlayStation")]
 [assembly: InternalsVisibleTo("Sentry.Unity.Tests")]
 [assembly: InternalsVisibleTo("Sentry.Unity.Editor")]
 [assembly: InternalsVisibleTo("Sentry.Unity.Editor.Tests")]