diff --git a/.gitignore b/.gitignore index 5eb52dc..9e48c67 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ *.pyc *.os *.tmp +*.dylib .*.swp can/*.so can/build/ diff --git a/can/packer_pyx_setup.py b/can/packer_pyx_setup.py index 6f7a47d..a52f84f 100644 --- a/can/packer_pyx_setup.py +++ b/can/packer_pyx_setup.py @@ -1,6 +1,7 @@ import os import sysconfig import subprocess +import platform from distutils.core import Extension, setup # pylint: disable=import-error,no-name-in-module from Cython.Build import cythonize @@ -51,10 +52,13 @@ setup(name='CAN packer', BASEDIR, os.path.join(BASEDIR, 'phonelibs', 'capnp-cpp/include'), ], - extra_link_args=[ - os.path.join(BASEDIR, 'opendbc', 'can', 'libdbc.so'), - ], + libraries=["dbc"], + library_dirs=["."], ) ), nthreads=4, ) + +if platform.system() == "Darwin": + os.system("install_name_tool -change opendbc/can/libdbc.dylib "+BASEDIR+"/opendbc/can/libdbc.dylib packer_pyx.so") + diff --git a/can/parser_pyx_setup.py b/can/parser_pyx_setup.py index 8ce6e7e..796a14d 100644 --- a/can/parser_pyx_setup.py +++ b/can/parser_pyx_setup.py @@ -1,6 +1,7 @@ import os import subprocess import sysconfig +import platform from distutils.core import Extension, setup # pylint: disable=import-error,no-name-in-module from Cython.Build import cythonize @@ -50,10 +51,13 @@ setup(name='CAN parser', BASEDIR, os.path.join(BASEDIR, 'phonelibs', 'capnp-cpp/include'), ], - extra_link_args=[ - os.path.join(BASEDIR, 'opendbc', 'can', 'libdbc.so'), - ], + libraries=["dbc"], + library_dirs=["."], ) ), nthreads=4, ) + +if platform.system() == "Darwin": + os.system("install_name_tool -change opendbc/can/libdbc.dylib "+BASEDIR+"/opendbc/can/libdbc.dylib parser_pyx.so") +