The library is always loaded in memory

BadSingleton · BadSingleton · commit ea98492d0a6d · 2020-07-14T15:12:21.000-04:00
Remove the `ifdef`s
We also build for python 3.7.
diff --git a/src/runtime/Python.Runtime.15.csproj b/src/runtime/Python.Runtime.15.csproj
@@ -84,7 +84,7 @@
     <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2;$(Python2Version);$(PythonWinDefineConstants)</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWinPY3'">
-    <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3;$(Python3Version);$(PythonWinDefineConstants)</DefineConstants>
+    <DefineConstants Condition="'$(CustomDefineConstants)' == ''">TRACE;XPLAT;;PYTHON3;PYTHON37;UCS2</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'DebugWin'">
     <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2;$(Python2Version);$(PythonWinDefineConstants);FINALIZER_CHECK;TRACE;DEBUG</DefineConstants>
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -95,11 +95,8 @@ public class Runtime
 
         public static readonly string PythonDLL = _PythonDll;
 
-#if PYTHON_WITHOUT_ENABLE_SHARED && !NETSTANDARD
+        // In Unity, the library is always loaded in-memory
         internal const string _PythonDll = "__Internal";
-#else
-        internal const string _PythonDll = dllBase + dllWithPyDebug + dllWithPyMalloc;
-#endif
 #if MONO_LINUX
         internal const string dllDirectory = "Library/conda/lib/";
         internal const string pythonlib = "python3.7m";
@@ -1045,7 +1042,10 @@ internal static int PyObject_Compare(IntPtr value1, IntPtr value2)
         [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
         internal static extern int PyCallable_Check(IntPtr pointer);
 
-        [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
+        // [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl, EntryPoint = "PyObject_IsTrue")]
+        // internal static extern int _PyObject_IsTrue(IntPtr pointer);
+        // internal static int PyObject_IsTrue(IntPtr ptr) => _PyObject_IsTrue(ptr);
+        [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl, EntryPoint = "PyObject_IsTrue")]
         internal static extern int PyObject_IsTrue(IntPtr pointer);
 
         [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
@@ -1058,7 +1058,6 @@ internal static long PyObject_Size(IntPtr pointer)
 
         [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl, EntryPoint = "PyObject_Size")]
         private static extern IntPtr _PyObject_Size(IntPtr pointer);
-
         [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
         internal static extern IntPtr PyObject_Hash(IntPtr op);
 
