Make setup.py work again

filmor · filmor · commit 60d15cdcf1c8 · 2019-12-17T09:59:56.000+01:00
diff --git a/Python.Runtime/runtime.cs b/Python.Runtime/runtime.cs
@@ -87,6 +87,12 @@ public static partial class Runtime
 
         public static int MainManagedThreadId { get; private set; }
 
+        #if UCS2 && PYTHON2
+        static int _UCS = 2;
+        #else
+        static int _UCS = 4;
+        #endif
+
         /// <summary>
         /// Encoding to use to convert Unicode to/from Managed to Native
         /// </summary>
@@ -223,18 +229,9 @@ internal static void Initialize(bool initSigs = false)
             IntPtr dllLocal = IntPtr.Zero;
             var loader = LibraryLoader.Get(OperatingSystem);
 
-            if (_PythonDll != "__Internal")
-            {
-                dllLocal = loader.Load(_PythonDll);
-            }
             _PyObject_NextNotImplemented = loader.GetFunction(dllLocal, "_PyObject_NextNotImplemented");
             PyModuleType = loader.GetFunction(dllLocal, "PyModule_Type");
 
-            if (dllLocal != IntPtr.Zero)
-            {
-                loader.Free(dllLocal);
-            }
-
             // Initialize modules that depend on the runtime class.
             AssemblyManager.Initialize();
             PyCLRMetaType = MetaType.Initialize();
diff --git a/setup.py b/setup.py
@@ -88,5 +88,10 @@ def finalize_options(self):
             "Python.Runtime/",
             output="pythonnet/dlls",
         ),
+        DotnetLib(
+            "python-runtime-native",
+            "Python.Runtime.Native/",
+            output="pythonnet/dlls",
+        ),
     },
 )
