Fixed build issues on macOS (#22075)

* Fixed deprecated enum value

* Changed to build Qt replay on macOS
old-commit-hash: ed271911c2
commatwo_master
ambientocclusion 4 years ago committed by GitHub
parent 472e15ecd0
commit 488f3b2624
  1. 2
      selfdrive/ui/SConscript
  2. 2
      selfdrive/ui/qt/offroad/networking.cc
  3. 2
      selfdrive/ui/replay/replay.cc

@ -104,7 +104,7 @@ if GetOption('setup'):
# build headless replay
if arch == 'x86_64' and os.path.exists(Dir("#tools/").get_abspath()):
if arch in ['x86_64', 'Darwin'] and os.path.exists(Dir("#tools/").get_abspath()):
qt_env['CXXFLAGS'] += ["-Wno-deprecated-declarations"]
replay_lib_src = ["replay/replay.cc", "replay/filereader.cc", "replay/framereader.cc"]

@ -50,7 +50,7 @@ Networking::Networking(QWidget* parent, bool show_advanced) : QFrame(parent) {
main_layout->addWidget(an);
QPalette pal = palette();
pal.setColor(QPalette::Background, QColor(0x29, 0x29, 0x29));
pal.setColor(QPalette::Window, QColor(0x29, 0x29, 0x29));
setAutoFillBackground(true);
setPalette(pal);

@ -225,7 +225,7 @@ void Replay::stream() {
}
uint64_t tm = e.getLogMonoTime();
current_ts = std::max(tm - route_start_ts, (unsigned long)0) / 1e9;
current_ts = std::max(tm - route_start_ts, (uint64_t)0) / 1e9;
if (socks.contains(type)) {
float timestamp = (tm - route_start_ts)/1e9;

Loading…
Cancel
Save