mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

deps: Build wxWidgets without mspack support 

We don't use wxWidgets' CHM support, so don't require libmspack's
development libraries, and disable building wxWidgets with the support.
This commit is contained in:
Bastien Nocera 2023-11-24 17:19:41 +01:00 committed by Lane.Wei
parent c161cda0d7
commit 9f69b21b5c
4 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BuildLinux.sh
View File

@ -88,7 +88,7 @@ then
fi fi
# Addtional Dev packages for BambuStudio # Addtional Dev packages for BambuStudio
export REQUIRED_DEV_PACKAGES="libmspack-dev libgstreamerd-3-dev libsecret-1-dev libwebkit2gtk-4.0-dev libosmesa6-dev libssl-dev libcurl4-openssl-dev eglexternalplatform-dev libudev-dev libdbus-1-dev extra-cmake-modules" export REQUIRED_DEV_PACKAGES="libgstreamerd-3-dev libsecret-1-dev libwebkit2gtk-4.0-dev libosmesa6-dev libssl-dev libcurl4-openssl-dev eglexternalplatform-dev libudev-dev libdbus-1-dev extra-cmake-modules"
# libwebkit2gtk-4.1-dev ?? # libwebkit2gtk-4.1-dev ??
export DEV_PACKAGES_COUNT=$(echo ${REQUIRED_DEV_PACKAGES} | wc -w) export DEV_PACKAGES_COUNT=$(echo ${REQUIRED_DEV_PACKAGES} | wc -w)
if [ $(dpkg --get-selections | grep -E "$(echo ${REQUIRED_DEV_PACKAGES} | tr ' ' '|')" | wc -l) -lt ${DEV_PACKAGES_COUNT} ]; then if [ $(dpkg --get-selections | grep -E "$(echo ${REQUIRED_DEV_PACKAGES} | tr ' ' '|')" | wc -l) -lt ${DEV_PACKAGES_COUNT} ]; then

1
Containerfile
View File

@ -44,7 +44,6 @@ RUN apt-get update && apt-get install -y \
libgtk-3-dev libwebkit2gtk-4.0-dev \ libgtk-3-dev libwebkit2gtk-4.0-dev \
libsoup2.4-dev \ libsoup2.4-dev \
libgstreamer1.0-dev libgstreamer-plugins-good1.0-dev libgstreamer-plugins-base1.0-dev libgstreamerd-3-dev \ libgstreamer1.0-dev libgstreamer-plugins-good1.0-dev libgstreamer-plugins-base1.0-dev libgstreamerd-3-dev \
libmspack-dev \
libosmesa6-dev \ libosmesa6-dev \
libssl3 libssl-dev libcurl4-openssl-dev libsecret-1-dev \ libssl3 libssl-dev libcurl4-openssl-dev libsecret-1-dev \
libudev-dev \ libudev-dev \

1
Dockerfile
View File

@ -32,7 +32,6 @@ RUN apt-get update && apt-get install -y \
libgstreamer-plugins-good1.0-dev \ libgstreamer-plugins-good1.0-dev \
libgtk-3-dev \ libgtk-3-dev \
libgtk-3-dev \ libgtk-3-dev \
libmspack-dev \
libosmesa6-dev \ libosmesa6-dev \
libsecret-1-dev \ libsecret-1-dev \
libsoup2.4-dev \ libsoup2.4-dev \

1
deps/wxWidgets/wxWidgets.cmake vendored
View File

@ -45,6 +45,7 @@ bambustudio_add_cmake_project(wxWidgets
${_wx_edge} ${_wx_edge}
-DwxUSE_WEBVIEW_IE=OFF -DwxUSE_WEBVIEW_IE=OFF
-DwxUSE_REGEX=builtin -DwxUSE_REGEX=builtin
-DwxUSE_LIBMSPACK=OFF
-DwxUSE_LIBXPM=builtin -DwxUSE_LIBXPM=builtin
-DwxUSE_LIBSDL=OFF -DwxUSE_LIBSDL=OFF
-DwxUSE_XTEST=OFF -DwxUSE_XTEST=OFF