Merge pull request #20 from mattbaker-digital/master

Fix missing Gregorian/SDN function exports in pxlib binaries
mherrmann · Apr 22, 2020 · a797fdd · a797fdd
2 parents f420f57 + 2495b3b
commit a797fdd
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 2 deletions.
diff --git a/pypxlib/pxlib_ctypes/libpx.so b/pypxlib/pxlib_ctypes/libpx.so
diff --git a/pypxlib/pxlib_ctypes/libpx.dylib → pypxlib/pxlib_ctypes/libpx_x64.dylib b/pypxlib/pxlib_ctypes/libpx.dylib → pypxlib/pxlib_ctypes/libpx_x64.dylib
diff --git a/pypxlib/pxlib_ctypes/libpx_x64.so b/pypxlib/pxlib_ctypes/libpx_x64.so
diff --git a/pypxlib/pxlib_ctypes/pxlib.dll b/pypxlib/pxlib_ctypes/pxlib.dll
diff --git a/pypxlib/pxlib_ctypes/pxlib_x64.dll b/pypxlib/pxlib_ctypes/pxlib_x64.dll
diff --git 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
@@ -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