retropilot
/
opendbc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build on mac AND linux, also gotta not use these python files

master
George Hotz 2019-12-14 19:48:56 -08:00
parent 79dbfc1aec
commit 6e6779f993
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
can/packer_pyx_setup.py
View File

@ -39,6 +39,10 @@ ARCH = subprocess.check_output(["uname", "-m"], encoding='utf8').rstrip() # pyl
if ARCH == "aarch64": if ARCH == "aarch64":
extra_compile_args += ["-Wno-deprecated-register"] extra_compile_args += ["-Wno-deprecated-register"]
if platform.system() == "Darwin":
libdbc = "libdbc.dylib"
else:
libdbc = "libdbc.so"
setup(name='CAN packer', setup(name='CAN packer',
cmdclass={'build_ext': BuildExtWithoutPlatformSuffix}, cmdclass={'build_ext': BuildExtWithoutPlatformSuffix},
@ -52,8 +56,9 @@ setup(name='CAN packer',
BASEDIR, BASEDIR,
os.path.join(BASEDIR, 'phonelibs', 'capnp-cpp/include'), os.path.join(BASEDIR, 'phonelibs', 'capnp-cpp/include'),
], ],
libraries=["dbc"], extra_link_args=[
library_dirs=["."], os.path.join(BASEDIR, 'opendbc', 'can', libdbc),
],
) )
), ),
nthreads=4, nthreads=4,

10
can/parser_pyx_setup.py
View File

@ -39,6 +39,11 @@ ARCH = subprocess.check_output(["uname", "-m"], encoding='utf8').rstrip() # pyl
if ARCH == "aarch64": if ARCH == "aarch64":
extra_compile_args += ["-Wno-deprecated-register"] extra_compile_args += ["-Wno-deprecated-register"]
if platform.system() == "Darwin":
libdbc = "libdbc.dylib"
else:
libdbc = "libdbc.so"
setup(name='CAN parser', setup(name='CAN parser',
cmdclass={'build_ext': BuildExtWithoutPlatformSuffix}, cmdclass={'build_ext': BuildExtWithoutPlatformSuffix},
ext_modules=cythonize( ext_modules=cythonize(
@ -51,8 +56,9 @@ setup(name='CAN parser',
BASEDIR, BASEDIR,
os.path.join(BASEDIR, 'phonelibs', 'capnp-cpp/include'), os.path.join(BASEDIR, 'phonelibs', 'capnp-cpp/include'),
], ],
libraries=["dbc"], extra_link_args=[
library_dirs=["."], os.path.join(BASEDIR, 'opendbc', 'can', libdbc),
],
) )
), ),
nthreads=4, nthreads=4,