From 73a7a913696882defcbd8faf57dc341f69d19f4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?T=C3=BAlio=20Toffolo?= Date: Wed, 3 Jul 2019 15:11:59 -0300 Subject: [PATCH] Including MacOS (darwin) binaries Former-commit-id: fec262d43853fa564a5b531c49c5a7f80a49b1b2 [formerly 8398425febed1a085835af9850f740404c82250d] Former-commit-id: c1867d7285443a4ee7eb46823528eae7526b326d --- mip/cbc.py | 4 ++-- mip/libraries/cbc-c-darwin-x86-64.dylib.REMOVED.git-id | 1 + mip/libraries/cbc-c-macos-x86-64.dylb.REMOVED.git-id | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 mip/libraries/cbc-c-darwin-x86-64.dylib.REMOVED.git-id delete mode 100644 mip/libraries/cbc-c-macos-x86-64.dylb.REMOVED.git-id diff --git a/mip/cbc.py b/mip/cbc.py index 44313ab1..4eebb8cc 100644 --- a/mip/cbc.py +++ b/mip/cbc.py @@ -39,9 +39,9 @@ libfile = os.path.join(pathlib, 'cbc-c-windows-x86-64.dll') else: libfile = os.path.join(pathlib, 'cbc-c-windows-x86-32.dll') - elif platform.lower().startswith('darwin'): + elif platform.lower().startswith('darwin') or platform.lower().startswith('macos'): if os_is_64_bit: - libfile = os.path.join(pathlib, 'cbc-c-darwin-x86-64.a') + libfile = os.path.join(pathlib, 'cbc-c-darwin-x86-64.dylib') if not libfile: raise Exception( "You operating system/platform is not supported") diff --git a/mip/libraries/cbc-c-darwin-x86-64.dylib.REMOVED.git-id b/mip/libraries/cbc-c-darwin-x86-64.dylib.REMOVED.git-id new file mode 100644 index 00000000..b2f1bc49 --- /dev/null +++ b/mip/libraries/cbc-c-darwin-x86-64.dylib.REMOVED.git-id @@ -0,0 +1 @@ +851e0c8c9801a8ad5027bd354a4390a6a7d8be5f \ No newline at end of file diff --git a/mip/libraries/cbc-c-macos-x86-64.dylb.REMOVED.git-id b/mip/libraries/cbc-c-macos-x86-64.dylb.REMOVED.git-id deleted file mode 100644 index e1a11b7e..00000000 --- a/mip/libraries/cbc-c-macos-x86-64.dylb.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -a7d8bd39206b5b25bd93d5cc39e000976999c33c \ No newline at end of file