diff --git a/.gitmodules b/.gitmodules index 73f832b1d..765a430dd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -19,3 +19,6 @@ [submodule "tinygrad"] path = tinygrad_repo url = https://github.com/geohot/tinygrad.git +[submodule "dp_priv"] + path = dp_priv + url = https://github.com/dragonpilot-community/dp_priv.git diff --git a/SConstruct b/SConstruct index 1e9f2a6b5..62c8aa473 100644 --- a/SConstruct +++ b/SConstruct @@ -165,6 +165,10 @@ else: ccflags = [] ldflags = [] +if len(os.listdir(Dir(f"#dp_priv/").abspath)) > 2: + cflags += ["-DDP"] + cxxflags += ["-DDP"] + # no --as-needed on mac linker if arch != "Darwin": ldflags += ["-Wl,--as-needed", "-Wl,--no-undefined"] diff --git a/openpilot/dp_priv b/openpilot/dp_priv new file mode 120000 index 000000000..d50c67cb4 --- /dev/null +++ b/openpilot/dp_priv @@ -0,0 +1 @@ +../dp_priv/ \ No newline at end of file diff --git a/selfdrive/ui/SConscript b/selfdrive/ui/SConscript index 13b6998de..9d1ac05c0 100644 --- a/selfdrive/ui/SConscript +++ b/selfdrive/ui/SConscript @@ -3,6 +3,11 @@ import json Import('qt_env', 'arch', 'common', 'messaging', 'visionipc', 'cereal', 'transformations') +def insert_src(list, after_src, src): + return list[:list.index(after_src)+1] + src + list[list.index(after_src)+1:] + +dp_priv = len(os.listdir(Dir(f"#dp_priv/").abspath)) > 2 + base_libs = [common, messaging, cereal, visionipc, transformations, 'zmq', 'capnp', 'kj', 'm', 'OpenCL', 'ssl', 'crypto', 'pthread'] + qt_env["LIBS"]