File tree Expand file tree Collapse file tree 2 files changed +11
-9
lines changed Expand file tree Collapse file tree 2 files changed +11
-9
lines changed Original file line number Diff line number Diff line change @@ -87,6 +87,12 @@ public static partial class Runtime
87
87
88
88
public static int MainManagedThreadId { get ; private set ; }
89
89
90
+ #if UCS2 && PYTHON2
91
+ static int _UCS = 2 ;
92
+ #else
93
+ static int _UCS = 4 ;
94
+ #endif
95
+
90
96
/// <summary>
91
97
/// Encoding to use to convert Unicode to/from Managed to Native
92
98
/// </summary>
@@ -223,18 +229,9 @@ internal static void Initialize(bool initSigs = false)
223
229
IntPtr dllLocal = IntPtr . Zero ;
224
230
var loader = LibraryLoader . Get ( OperatingSystem ) ;
225
231
226
- if ( _PythonDll != "__Internal" )
227
- {
228
- dllLocal = loader . Load ( _PythonDll ) ;
229
- }
230
232
_PyObject_NextNotImplemented = loader . GetFunction ( dllLocal , "_PyObject_NextNotImplemented" ) ;
231
233
PyModuleType = loader . GetFunction ( dllLocal , "PyModule_Type" ) ;
232
234
233
- if ( dllLocal != IntPtr . Zero )
234
- {
235
- loader . Free ( dllLocal ) ;
236
- }
237
-
238
235
// Initialize modules that depend on the runtime class.
239
236
AssemblyManager . Initialize ( ) ;
240
237
PyCLRMetaType = MetaType . Initialize ( ) ;
Original file line number Diff line number Diff line change @@ -88,5 +88,10 @@ def finalize_options(self):
88
88
"Python.Runtime/" ,
89
89
output = "pythonnet/dlls" ,
90
90
),
91
+ DotnetLib (
92
+ "python-runtime-native" ,
93
+ "Python.Runtime.Native/" ,
94
+ output = "pythonnet/dlls" ,
95
+ ),
91
96
},
92
97
)
You can’t perform that action at this time.
0 commit comments