@@ -21,30 +21,12 @@ def open(
21
21
"""
22
22
23
23
platform_values = {
24
- "windows" : {
25
- "framework_libpath" : "MaaFramework.dll" ,
26
- "toolkit_libpath" : "MaaToolkit.dll" ,
27
- "environ_var" : "PATH" ,
28
- },
29
- "darwin" : {
30
- "framework_libpath" : "libMaaFramework.dylib" ,
31
- "toolkit_libpath" : "libMaaToolkit.dylib" ,
32
- "environ_var" : "DYLD_LIBRARY_PATH" ,
33
- },
34
- "linux" : {
35
- "framework_libpath" : "libMaaFramework.so" ,
36
- "toolkit_libpath" : "libMaaToolkit.so" ,
37
- "environ_var" : "LD_LIBRARY_PATH" ,
38
- },
24
+ "windows" : ("MaaFramework.dll" , "MaaToolkit.dll" ),
25
+ "darwin" : ("libMaaFramework.dylib" , "libMaaToolkit.dylib" ),
26
+ "linux" : ("libMaaFramework.so" , "libMaaToolkit.so" ),
39
27
}
40
28
41
29
platform_type = platform .system ().lower ()
42
- environ_var = platform_values [platform_type ]["environ_var" ]
43
- environ = os .environ [environ_var ]
44
- try :
45
- environ += os .pathsep + str (path )
46
- except KeyError :
47
- environ = str (path )
48
30
49
31
if platform_type == "windows" :
50
32
lib_import = ctypes .WinDLL
@@ -53,7 +35,7 @@ def open(
53
35
54
36
try :
55
37
cls .framework_libpath = (
56
- pathlib .Path (path ) / platform_values [platform_type ]["framework_libpath" ]
38
+ pathlib .Path (path ) / platform_values [platform_type ][0 ]
57
39
)
58
40
cls .framework = lib_import (str (cls .framework_libpath ))
59
41
except OSError :
@@ -67,8 +49,7 @@ def open(
67
49
if toolkit :
68
50
try :
69
51
cls .toolkit_libpath = (
70
- pathlib .Path (path )
71
- / platform_values [platform_type ]["toolkit_libpath" ]
52
+ pathlib .Path (path ) / platform_values [platform_type ][1 ]
72
53
)
73
54
cls .toolkit = lib_import (str (cls .toolkit_libpath ))
74
55
except OSError :
0 commit comments