From 9c7c4657f09a18293fef153612ff40d28ca6a848 Mon Sep 17 00:00:00 2001
From: Adeeb Shihadeh <adeebshihadeh@gmail.com>
Date: Mon, 23 Aug 2021 20:12:40 -0700
Subject: [PATCH] UI: use rcc on all platforms (#21966)

---
 selfdrive/ui/SConscript     | 24 +++++++++++-------------
 selfdrive/ui/qt/qt_window.h |  4 ----
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/selfdrive/ui/SConscript b/selfdrive/ui/SConscript
index 7166fe5b5..4b179ad31 100644
--- a/selfdrive/ui/SConscript
+++ b/selfdrive/ui/SConscript
@@ -28,9 +28,7 @@ if arch != 'aarch64':
   widgets_src += ["qt/offroad/networking.cc", "qt/offroad/wifiManager.cc"]
 
 qt_env['CPPDEFINES'] = []
-if GetOption('setup'):
-  qt_env['CPPDEFINES'] += ["USE_QRC"]
-elif maps:
+if maps:
   base_libs += ['qmapboxgl']
   widgets_src += ["qt/maps/map_helpers.cc", "qt/maps/map_settings.cc", "qt/maps/map.cc"]
   qt_env['CPPDEFINES'] += ["ENABLE_MAPS"]
@@ -38,6 +36,13 @@ elif maps:
 widgets = qt_env.Library("qt_widgets", widgets_src, LIBS=base_libs)
 qt_libs = [widgets] + base_libs
 
+# build assets
+assets = "#selfdrive/assets/assets.cc"
+assets_src = "#selfdrive/assets/assets.qrc"
+qt_env.Command(assets, assets_src, f"rcc $SOURCES -o $TARGET")
+qt_env.Depends(assets, Glob('#selfdrive/assets/*', exclude=[assets, assets_src, "#selfdrive/assets/assets.o"]))
+asset_obj = qt_env.Object("assets", assets)
+
 # build soundd
 qt_env.Program("_soundd", "soundd.cc", LIBS=base_libs)
 
@@ -48,21 +53,14 @@ qt_env.Program("qt/spinner", ["qt/spinner.cc"], LIBS=qt_libs)
 # build main UI
 qt_src = ["main.cc", "ui.cc", "paint.cc", "qt/sidebar.cc", "qt/onroad.cc",
           "qt/window.cc", "qt/home.cc", "qt/offroad/settings.cc",
-          "qt/offroad/onboarding.cc", "qt/offroad/driverview.cc", "#phonelibs/nanovg/nanovg.c"]
-
-qt_env.Program("_ui", qt_src, LIBS=qt_libs)
+          "qt/offroad/onboarding.cc", "qt/offroad/driverview.cc",
+          "#phonelibs/nanovg/nanovg.c"]
+qt_env.Program("_ui", qt_src + [asset_obj], LIBS=qt_libs)
 
 
 # setup, factory resetter, and agnos updater
 if arch != 'aarch64' and GetOption('setup'):
 
-  # TODO: do this for all resources once NEOS has rcc
-  assets = "#selfdrive/assets/assets.cc"
-  assets_src = "#selfdrive/assets/assets.qrc"
-  qt_env.Command(assets, assets_src, f"rcc $SOURCES -o $TARGET")
-  qt_env.Depends(assets, Glob('#selfdrive/assets/*', exclude=[assets, assets_src, "#selfdrive/assets/assets.o"]))
-  asset_obj = qt_env.Object("assets", assets)
-
   qt_env.Program("qt/setup/reset", ["qt/setup/reset.cc"], LIBS=qt_libs)
   qt_env.Program("qt/setup/updater", ["qt/setup/updater.cc", asset_obj], LIBS=qt_libs)
   qt_env.Program("qt/setup/setup", ["qt/setup/setup.cc", asset_obj],
diff --git a/selfdrive/ui/qt/qt_window.h b/selfdrive/ui/qt/qt_window.h
index 89d0c8061..a2dcbb425 100644
--- a/selfdrive/ui/qt/qt_window.h
+++ b/selfdrive/ui/qt/qt_window.h
@@ -13,11 +13,7 @@
 
 #include "selfdrive/hardware/hw.h"
 
-#ifdef USE_QRC
 const QString ASSET_PATH = ":/";
-#else
-const QString ASSET_PATH = "../assets/";
-#endif
 
 const bool WIDE_UI = Hardware::TICI() || getenv("WIDE_UI") != nullptr;
 const int vwp_w = WIDE_UI ? 2160 : 1920;