diff --git a/pypxlib/pxlib_ctypes/libpx.so b/pypxlib/pxlib_ctypes/libpx.so index cf0ab91..e6ce829 100755 Binary files a/pypxlib/pxlib_ctypes/libpx.so and b/pypxlib/pxlib_ctypes/libpx.so differ diff --git a/pypxlib/pxlib_ctypes/libpx.dylib b/pypxlib/pxlib_ctypes/libpx_x64.dylib similarity index 100% rename from pypxlib/pxlib_ctypes/libpx.dylib rename to pypxlib/pxlib_ctypes/libpx_x64.dylib diff --git a/pypxlib/pxlib_ctypes/libpx_x64.so b/pypxlib/pxlib_ctypes/libpx_x64.so new file mode 100644 index 0000000..cf0ab91 Binary files /dev/null and b/pypxlib/pxlib_ctypes/libpx_x64.so differ diff --git a/pypxlib/pxlib_ctypes/py2.py b/pypxlib/pxlib_ctypes/py2.py index 5132cbe..e633071 100644 --- a/pypxlib/pxlib_ctypes/py2.py +++ b/pypxlib/pxlib_ctypes/py2.py @@ -606,7 +606,15 @@ def add_library_search_dirs(other_dirs): _is_64_bit = sys.maxsize > 2 ** 32 -_px_lib = 'pxlib_x64' if sys.platform == 'win32' and _is_64_bit else 'px' +# Select the correct library for the platform and architecture +_px_lib = None +if sys.platform == 'win32' and _is_64_bit: + _px_lib = 'pxlib_x64' +elif _is_64_bit: + _px_lib = 'px_x64' +else: + _px_lib = 'px' + _libs["px"] = load_library(_px_lib) # 1 libraries diff --git a/pypxlib/pxlib_ctypes/py3.py b/pypxlib/pxlib_ctypes/py3.py index 0005c68..9238718 100644 --- a/pypxlib/pxlib_ctypes/py3.py +++ b/pypxlib/pxlib_ctypes/py3.py @@ -605,7 +605,15 @@ def add_library_search_dirs(other_dirs): _is_64_bit = sys.maxsize > 2 ** 32 -_px_lib = 'pxlib_x64' if sys.platform == 'win32' and _is_64_bit else 'px' +# Select the correct library for the platform and architecture +_px_lib = None +if sys.platform == 'win32' and _is_64_bit: + _px_lib = 'pxlib_x64' +elif _is_64_bit: + _px_lib = 'px_x64' +else: + _px_lib = 'px' + _libs["px"] = load_library(_px_lib) # 1 libraries