Add preprocessor directive to load proper platform dll

baptisteguidoux · baptisteguidoux · commit 82ce9120ebdb · 2020-07-22T19:02:03.000-04:00
diff --git a/src/runtime/pythonengine.cs b/src/runtime/pythonengine.cs
@@ -151,7 +151,14 @@ public static void InitializeLibrary()
         {
             if (!libraryLoaded)
             {
-                var _loader = Python.Runtime.Platform.LibraryLoader.Get(Runtime.OperatingSystem);
+#if MONO_OSX
+                var os = Python.Runtime.Platform.OperatingSystemType.Darwin;
+#elif MONO_LINUX
+                var os = Python.Runtime.Platform.OperatingSystemType.Linux;
+#else
+                var os = Python.Runtime.Platform.OperatingSystemType.Windows;
+#endif
+                var _loader = Python.Runtime.Platform.LibraryLoader.Get(os);
                 _loader.Load(Runtime.pythonlib, Runtime.dllDirectory);
                 libraryLoaded = true;
             }
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -318,9 +318,16 @@ internal static void Initialize(bool initSigs = false)
             InitializePlatformData();
 
             IntPtr dllLocal = IntPtr.Zero;
-            var loader = LibraryLoader.Get(OperatingSystem);
 
-            if (!(OperatingSystem == OperatingSystemType.Windows))
+#if MONO_OSX
+                var os = Python.Runtime.Platform.OperatingSystemType.Darwin;
+#elif MONO_LINUX
+                var os = Python.Runtime.Platform.OperatingSystemType.Linux;
+#else
+                var os = Python.Runtime.Platform.OperatingSystemType.Windows;
+#endif
+            var loader = LibraryLoader.Get(os);
+            if (!(os == OperatingSystemType.Windows))
             {
             if (_PythonDll != "__Internal")
             {

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,14 @@ public static void InitializeLibrary()`
`151`	`151`	`{`
`152`	`152`	`if (!libraryLoaded)`
`153`	`153`	`{`
`154`		`- var _loader = Python.Runtime.Platform.LibraryLoader.Get(Runtime.OperatingSystem);`
	`154`	`+#if MONO_OSX`
	`155`	`+ var os = Python.Runtime.Platform.OperatingSystemType.Darwin;`
	`156`	`+#elif MONO_LINUX`
	`157`	`+ var os = Python.Runtime.Platform.OperatingSystemType.Linux;`
	`158`	`+#else`
	`159`	`+ var os = Python.Runtime.Platform.OperatingSystemType.Windows;`
	`160`	`+#endif`
	`161`	`+ var _loader = Python.Runtime.Platform.LibraryLoader.Get(os);`
`155`	`162`	`_loader.Load(Runtime.pythonlib, Runtime.dllDirectory);`
`156`	`163`	`libraryLoaded = true;`
`157`	`164`	`}`