switch build flags to use opengl framework rather than gl library for OSX (#2467)
* switch build flags to use opengl framework rather than library for OSX * little cleaner * arch Co-authored-by: thatsaboi <thatsa@boi.com> Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
This commit is contained in:
parent
3795920750
commit
029be49012
|
@ -28,8 +28,9 @@ else:
|
|||
|
||||
if arch == "Darwin":
|
||||
del libs[libs.index('OpenCL')]
|
||||
del libs[libs.index(gpucommon)][gpucommon.index('GL')]
|
||||
env = env.Clone()
|
||||
env['FRAMEWORKS'] = ['OpenCL']
|
||||
env['FRAMEWORKS'] = ['OpenCL', 'OpenGL']
|
||||
|
||||
env.SharedLibrary('snapshot/visionipc',
|
||||
["#selfdrive/common/visionipc.c", "#selfdrive/common/ipc.c"])
|
||||
|
|
|
@ -17,15 +17,16 @@ else:
|
|||
qt_libs = ["pthread"]
|
||||
|
||||
qt_modules = ["Widgets", "Gui", "Core", "DBus", "Multimedia"]
|
||||
if arch == "Darwin":
|
||||
qt_env["FRAMEWORKS"] += [f"Qt{m}" for m in qt_modules]
|
||||
else:
|
||||
qt_libs += [f"Qt5{m}" for m in qt_modules]
|
||||
|
||||
if arch == "larch64":
|
||||
qt_libs += ["GLESv2", "wayland-client"]
|
||||
else:
|
||||
elif arch != "Darwin":
|
||||
qt_libs += ["GL"]
|
||||
|
||||
if arch == "Darwin":
|
||||
qt_env["FRAMEWORKS"] += [f"Qt{m}" for m in qt_modules] + ["OpenGL"]
|
||||
else:
|
||||
qt_libs += [f"Qt5{m}" for m in qt_modules]
|
||||
|
||||
qt_src = ["qt/ui.cc", "qt/window.cc", "qt/qt_sound.cc", "qt/offroad/settings.cc", "qt/offroad/onboarding.cc"] + src
|
||||
qt_env.Program("_ui", qt_src, LIBS=qt_libs + libs)
|
||||
|
|
Loading…
Reference in a new issue