build for mac (#23048)

pull/23270/head
George Hotz 3 years ago committed by GitHub
parent 646fe7de4b
commit 16dd7ce1fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      SConstruct
  2. 5
      selfdrive/controls/lib/lateral_mpc_lib/SConscript
  3. 5
      selfdrive/controls/lib/longitudinal_mpc_lib/SConscript
  4. 2
      selfdrive/ui/qt/widgets/cameraview.cc
  5. 3
      selfdrive/ui/replay/framereader.cc
  6. BIN
      third_party/acados/Darwin/lib/libacados.dylib
  7. BIN
      third_party/acados/Darwin/lib/libblasfeo.dylib
  8. BIN
      third_party/acados/Darwin/lib/libhpipm.dylib
  9. BIN
      third_party/acados/Darwin/lib/libqpOASES_e.3.1.dylib
  10. 1
      third_party/acados/Darwin/lib/libqpOASES_e.dylib
  11. BIN
      third_party/acados/Darwin/t_renderer

@ -127,6 +127,7 @@ else:
"/opt/homebrew/lib", "/opt/homebrew/lib",
"/usr/local/opt/openssl/lib", "/usr/local/opt/openssl/lib",
"/opt/homebrew/opt/openssl/lib", "/opt/homebrew/opt/openssl/lib",
f"#third_party/acados/{arch}/lib",
"/System/Library/Frameworks/OpenGL.framework/Libraries", "/System/Library/Frameworks/OpenGL.framework/Libraries",
] ]
cflags += ["-DGL_SILENCE_DEPRECATION"] cflags += ["-DGL_SILENCE_DEPRECATION"]

@ -48,12 +48,13 @@ lenv.Clean(generated_files, Dir(gen))
lenv.Command(generated_files, lenv.Command(generated_files,
["lat_mpc.py"], ["lat_mpc.py"],
f"cd {Dir('.').abspath} && python lat_mpc.py") f"cd {Dir('.').abspath} && python3 lat_mpc.py")
lenv["CFLAGS"].append("-DACADOS_WITH_QPOASES") lenv["CFLAGS"].append("-DACADOS_WITH_QPOASES")
lenv["CXXFLAGS"].append("-DACADOS_WITH_QPOASES") lenv["CXXFLAGS"].append("-DACADOS_WITH_QPOASES")
lenv["CCFLAGS"].append("-Wno-unused") lenv["CCFLAGS"].append("-Wno-unused")
lenv["LINKFLAGS"].append("-Wl,--disable-new-dtags") if arch != "Darwin":
lenv["LINKFLAGS"].append("-Wl,--disable-new-dtags")
lib_solver = lenv.SharedLibrary(f"{gen}/acados_ocp_solver_lat", lib_solver = lenv.SharedLibrary(f"{gen}/acados_ocp_solver_lat",
build_files, build_files,
LIBS=['m', 'acados', 'hpipm', 'blasfeo', 'qpOASES_e']) LIBS=['m', 'acados', 'hpipm', 'blasfeo', 'qpOASES_e'])

@ -58,12 +58,13 @@ lenv.Clean(generated_files, Dir(gen))
lenv.Command(generated_files, lenv.Command(generated_files,
["long_mpc.py"], ["long_mpc.py"],
f"cd {Dir('.').abspath} && python long_mpc.py") f"cd {Dir('.').abspath} && python3 long_mpc.py")
lenv["CFLAGS"].append("-DACADOS_WITH_QPOASES") lenv["CFLAGS"].append("-DACADOS_WITH_QPOASES")
lenv["CXXFLAGS"].append("-DACADOS_WITH_QPOASES") lenv["CXXFLAGS"].append("-DACADOS_WITH_QPOASES")
lenv["CCFLAGS"].append("-Wno-unused") lenv["CCFLAGS"].append("-Wno-unused")
lenv["LINKFLAGS"].append("-Wl,--disable-new-dtags") if arch != "Darwin":
lenv["LINKFLAGS"].append("-Wl,--disable-new-dtags")
lib_solver = lenv.SharedLibrary(f"{gen}/acados_ocp_solver_long", lib_solver = lenv.SharedLibrary(f"{gen}/acados_ocp_solver_long",
build_files, build_files,
LIBS=['m', 'acados', 'hpipm', 'blasfeo', 'qpOASES_e']) LIBS=['m', 'acados', 'hpipm', 'blasfeo', 'qpOASES_e'])

@ -31,8 +31,8 @@ const char frame_fragment_shader[] =
"#version 150 core\n" "#version 150 core\n"
#else #else
"#version 300 es\n" "#version 300 es\n"
#endif
"precision mediump float;\n" "precision mediump float;\n"
#endif
"uniform sampler2D uTexture;\n" "uniform sampler2D uTexture;\n"
"in vec4 vTexCoord;\n" "in vec4 vTexCoord;\n"
"out vec4 colorOut;\n" "out vec4 colorOut;\n"

@ -15,7 +15,8 @@ struct buffer_data {
int readPacket(void *opaque, uint8_t *buf, int buf_size) { int readPacket(void *opaque, uint8_t *buf, int buf_size) {
struct buffer_data *bd = (struct buffer_data *)opaque; struct buffer_data *bd = (struct buffer_data *)opaque;
buf_size = std::min((size_t)buf_size, bd->size - bd->offset); assert(bd->offset <= bd->size);
buf_size = std::min((size_t)buf_size, (size_t)(bd->size - bd->offset));
if (!buf_size) return AVERROR_EOF; if (!buf_size) return AVERROR_EOF;
memcpy(buf, bd->data + bd->offset, buf_size); memcpy(buf, bd->data + bd->offset, buf_size);

Binary file not shown.

Binary file not shown.

Binary file not shown.

@ -0,0 +1 @@
libqpOASES_e.3.1.dylib

Binary file not shown.
Loading…
Cancel
Save