Setup system/ui/ move (#34124)

commaai · Nov 28, 2024 · 4226ef5 · 4226ef5
1 parent 8e14e40
commit 4226ef5
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/SConstruct b/SConstruct
@@ -366,6 +366,7 @@ SConscript(['rednose/SConscript'])
 
 # Build system services
 SConscript([
+  'system/ui/SConscript',
   'system/proclogd/SConscript',
   'system/ubloxd/SConscript',
   'system/loggerd/SConscript',

diff --git a/selfdrive/ui/SConscript b/selfdrive/ui/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'])
diff --git a/selfdrive/ui/raylib/.gitignore b/selfdrive/ui/raylib/.gitignore
diff --git a/system/ui/.gitignore b/system/ui/.gitignore
@@ -0,0 +1 @@
+spinner
diff --git a/selfdrive/ui/raylib/SConscript → system/ui/SConscript b/selfdrive/ui/raylib/SConscript → system/ui/SConscript
@@ -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)
diff --git a/selfdrive/ui/raylib/spinner.cc → system/ui/raylib/spinner.cc b/selfdrive/ui/raylib/spinner.cc → system/ui/raylib/spinner.cc
@@ -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;

diff --git a/selfdrive/ui/raylib/util.cc → system/ui/raylib/util.cc b/selfdrive/ui/raylib/util.cc → system/ui/raylib/util.cc
@@ -1,4 +1,4 @@
-#include "selfdrive/ui/raylib/util.h"
+#include "system/ui/raylib/util.h"
 
 #include <array>
 

diff --git a/selfdrive/ui/raylib/util.h → system/ui/raylib/util.h b/selfdrive/ui/raylib/util.h → system/ui/raylib/util.h