diff options
author | psi29a <psi29a@gmail.com> | 2022-01-10 19:38:55 +0000 |
---|---|---|
committer | psi29a <psi29a@gmail.com> | 2022-01-10 19:38:55 +0000 |
commit | 8ee8f81619f294cabe70c21bd363fefcaf1f5c87 (patch) | |
tree | 96aaa63b106f97381dee3c087312428eac9815dc | |
parent | c9d7eac8833bfe2b9896283e86372f6166a1781e (diff) | |
parent | 877f5c445ed296315505e826bceace9b2b92a1d8 (diff) |
Merge branch 'librecast_all_the_things' into 'master'
Add librecast-dev to deps that needed for Debian/Ubuntu
Closes #6546
See merge request OpenMW/openmw!1550
-rwxr-xr-x | CI/install_debian_deps.sh | 3 | ||||
-rw-r--r-- | docker/Dockerfile.ubuntu | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/CI/install_debian_deps.sh b/CI/install_debian_deps.sh index 945c5f09bf..131ccae305 100755 --- a/CI/install_debian_deps.sh +++ b/CI/install_debian_deps.sh @@ -22,9 +22,8 @@ declare -rA GROUPED_DEPS=( libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libswresample-dev libsdl2-dev libqt5opengl5-dev libopenal-dev libunshield-dev libtinyxml-dev libbullet-dev liblz4-dev libpng-dev libjpeg-dev libluajit-5.1-dev - ca-certificates + librecast-dev libsqlite3-dev ca-certificates " - # TODO: add librecastnavigation-dev when debian is ready # These dependencies can alternatively be built and linked statically. [openmw-deps-dynamic]="libmygui-dev libopenscenegraph-dev libsqlite3-dev" diff --git a/docker/Dockerfile.ubuntu b/docker/Dockerfile.ubuntu index 51aaa6465e..b5fadff3e3 100644 --- a/docker/Dockerfile.ubuntu +++ b/docker/Dockerfile.ubuntu @@ -13,7 +13,7 @@ RUN apt-get update \ libmygui-dev libunshield-dev liblz4-dev libtinyxml-dev libqt5opengl5-dev \ libboost-filesystem-dev libboost-program-options-dev libboost-iostreams-dev \ libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libswresample-dev \ - librecastnavigation-dev libluajit-5.1-dev + librecast-dev libsqlite3-dev libluajit-5.1-dev COPY build.sh /build.sh |