ui: Allow Qt spinner/text/setup/reset/updater to build on macOS (#34265)

ui: Allow spinner/text/setup/reset/updater to build on macOS
pull/34250/head
Jason Wen 4 months ago committed by GitHub
parent a82116ac46
commit 35278ba63b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 4
      selfdrive/ui/SConscript

@ -67,14 +67,13 @@ if GetOption('extras'):
qt_src.remove("main.cc") # replaced by test_runner qt_src.remove("main.cc") # replaced by test_runner
qt_env.Program('tests/test_translations', [asset_obj, 'tests/test_runner.cc', 'tests/test_translations.cc'] + qt_src, LIBS=qt_libs) qt_env.Program('tests/test_translations', [asset_obj, 'tests/test_runner.cc', 'tests/test_translations.cc'] + qt_src, LIBS=qt_libs)
if GetOption('extras') and arch != "Darwin": if GetOption('extras'):
qt_env.SharedLibrary("qt/python_helpers", ["qt/qt_window.cc"], LIBS=qt_libs) qt_env.SharedLibrary("qt/python_helpers", ["qt/qt_window.cc"], LIBS=qt_libs)
# spinner and text window # spinner and text window
qt_env.Program("_text", ["qt/text.cc"], LIBS=qt_libs) qt_env.Program("_text", ["qt/text.cc"], LIBS=qt_libs)
qt_env.Program("_spinner", ["qt/spinner.cc"], LIBS=qt_libs) qt_env.Program("_spinner", ["qt/spinner.cc"], LIBS=qt_libs)
# setup and factory resetter # setup and factory resetter
qt_env.Program("qt/setup/reset", ["qt/setup/reset.cc"], LIBS=qt_libs) qt_env.Program("qt/setup/reset", ["qt/setup/reset.cc"], LIBS=qt_libs)
qt_env.Program("qt/setup/setup", ["qt/setup/setup.cc", asset_obj], qt_env.Program("qt/setup/setup", ["qt/setup/setup.cc", asset_obj],
@ -83,6 +82,7 @@ if GetOption('extras') and arch != "Darwin":
# build updater UI # build updater UI
qt_env.Program("qt/setup/updater", ["qt/setup/updater.cc", asset_obj], LIBS=qt_libs) qt_env.Program("qt/setup/updater", ["qt/setup/updater.cc", asset_obj], LIBS=qt_libs)
if arch != "Darwin":
# build installers # build installers
senv = qt_env.Clone() senv = qt_env.Clone()
senv['LINKFLAGS'].append('-Wl,-strip-debug') senv['LINKFLAGS'].append('-Wl,-strip-debug')

Loading…
Cancel
Save