mawei/openpilot-evo
1
0
Fork 0
mirror of https://github.com/infiniteCable2/openpilot.git synced 2026-07-26 03:42:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Small fixes for macOS build (#24620)

Browse Source 
* Small fixes for macOS build

* remove gpu_libs
old-commit-hash: 1cc652602f008122cf82171f7705522d3e2457dd
This commit is contained in:
Willem Melching
2022-05-23 13:46:48 +02:00
committed by GitHub
parent d625ee361a
commit f7e2813438
4 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SConstruct
+2 -2
View File
@@ -331,13 +331,13 @@ if GetOption("clazy"):
Export('env', 'qt_env', 'arch', 'real_arch', 'SHARED', 'USE_WEBCAM')
SConscript(['common/SConscript'])
Import('_common', '_gpucommon', '_gpu_libs')
Import('_common', '_gpucommon')
if SHARED:
common, gpucommon = abspath(common), abspath(gpucommon)
else:
common = [_common, 'json11']
gpucommon = [_gpucommon] + _gpu_libs
gpucommon = [_gpucommon]
Export('common', 'gpucommon')
common/SConscript
+2 -7
View File
@@ -22,13 +22,8 @@ files = [
'visionimg.cc',
]
if arch == "larch64":
_gpu_libs = ["GLESv2"]
else:
_gpu_libs = ["GL"]
_gpucommon = fxn('gpucommon', files, LIBS=_gpu_libs)
Export('_common', '_gpucommon', '_gpu_libs')
_gpucommon = fxn('gpucommon', files)
Export('_common', '_gpucommon')
if GetOption('test'):
env.Program('tests/test_util', ['tests/test_util.cc'], LIBS=[_common])
selfdrive/loggerd/video_writer.cc
+1
View File
@@ -1,3 +1,4 @@
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
#include <cassert>
#include <cstdlib>
selfdrive/modeld/runners/snpemodel.h
+1
View File
@@ -1,4 +1,5 @@
#pragma once
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
#include <DlContainer/IDlContainer.hpp>
#include <DlSystem/DlError.hpp>