Setup system/ui/ move (#34124)

pull/34116/merge
Adeeb Shihadeh 9 months ago committed by GitHub
parent 8e14e400ef
commit 4226ef5a66
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 1
      SConstruct
  2. 2
      selfdrive/ui/SConscript
  3. 1
      selfdrive/ui/raylib/.gitignore
  4. 1
      system/ui/.gitignore
  5. 11
      system/ui/SConscript
  6. 2
      system/ui/raylib/spinner.cc
  7. 2
      system/ui/raylib/util.cc
  8. 0
      system/ui/raylib/util.h

@ -366,6 +366,7 @@ SConscript(['rednose/SConscript'])
# Build system services
SConscript([
'system/ui/SConscript',
'system/proclogd/SConscript',
'system/ubloxd/SConscript',
'system/loggerd/SConscript',

@ -110,5 +110,3 @@ if GetOption('extras') and arch != "Darwin":
# build watch3
if arch in ['x86_64', 'aarch64', 'Darwin'] or GetOption('extras'):
qt_env.Program("watch3", ["watch3.cc"], LIBS=qt_libs + ['common', 'msgq', 'visionipc'])
SConscript(['raylib/SConscript'])

@ -1 +0,0 @@
_spinner

@ -0,0 +1 @@
spinner

@ -1,9 +1,10 @@
Import('env', 'arch', 'common')
raylib_env = env.Clone()
raylib_util_lib = env.Library("raylib_util_lib", ['util.cc'], LIBS='raylib')
linked_libs = ['raylib', raylib_util_lib, common]
raylib_env['LIBPATH'] += [f'#third_party/raylib/{arch}/']
renv = env.Clone()
rayutil = env.Library("rayutil", ['raylib/util.cc'], LIBS='raylib')
linked_libs = ['raylib', rayutil, common]
renv['LIBPATH'] += [f'#third_party/raylib/{arch}/']
mac_frameworks = []
if arch == "Darwin":
@ -14,4 +15,4 @@ else:
linked_libs += ['OpenCL', 'dl', 'pthread']
if arch != 'aarch64':
raylib_env.Program("_spinner", ["spinner.cc"], LIBS=linked_libs, FRAMEWORKS=mac_frameworks)
renv.Program("spinner", ["raylib/spinner.cc"], LIBS=linked_libs, FRAMEWORKS=mac_frameworks)

@ -2,7 +2,7 @@
#include <cmath>
#include <iostream>
#include "selfdrive/ui/raylib/util.h"
#include "system/ui/raylib/util.h"
#include "third_party/raylib/include/raylib.h"
constexpr int kProgressBarWidth = 1000;

@ -1,4 +1,4 @@
#include "selfdrive/ui/raylib/util.h"
#include "system/ui/raylib/util.h"
#include <array>
Loading…
Cancel
Save