Small fixes for macOS build (#24620)

* Small fixes for macOS build

* remove gpu_libs
pull/24622/head
Willem Melching 3 years ago committed by GitHub
parent 779bfbc63e
commit 1cc652602f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      SConstruct
  2. 9
      common/SConscript
  3. 1
      selfdrive/loggerd/video_writer.cc
  4. 1
      selfdrive/modeld/runners/snpemodel.h

@ -331,13 +331,13 @@ if GetOption("clazy"):
Export('env', 'qt_env', 'arch', 'real_arch', 'SHARED', 'USE_WEBCAM') Export('env', 'qt_env', 'arch', 'real_arch', 'SHARED', 'USE_WEBCAM')
SConscript(['common/SConscript']) SConscript(['common/SConscript'])
Import('_common', '_gpucommon', '_gpu_libs') Import('_common', '_gpucommon')
if SHARED: if SHARED:
common, gpucommon = abspath(common), abspath(gpucommon) common, gpucommon = abspath(common), abspath(gpucommon)
else: else:
common = [_common, 'json11'] common = [_common, 'json11']
gpucommon = [_gpucommon] + _gpu_libs gpucommon = [_gpucommon]
Export('common', 'gpucommon') Export('common', 'gpucommon')

@ -22,13 +22,8 @@ files = [
'visionimg.cc', 'visionimg.cc',
] ]
if arch == "larch64": _gpucommon = fxn('gpucommon', files)
_gpu_libs = ["GLESv2"] Export('_common', '_gpucommon')
else:
_gpu_libs = ["GL"]
_gpucommon = fxn('gpucommon', files, LIBS=_gpu_libs)
Export('_common', '_gpucommon', '_gpu_libs')
if GetOption('test'): if GetOption('test'):
env.Program('tests/test_util', ['tests/test_util.cc'], LIBS=[_common]) env.Program('tests/test_util', ['tests/test_util.cc'], LIBS=[_common])

@ -1,3 +1,4 @@
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
#include <cassert> #include <cassert>
#include <cstdlib> #include <cstdlib>

@ -1,4 +1,5 @@
#pragma once #pragma once
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
#include <DlContainer/IDlContainer.hpp> #include <DlContainer/IDlContainer.hpp>
#include <DlSystem/DlError.hpp> #include <DlSystem/DlError.hpp>

Loading…
Cancel
Save