Skip to content

DRAFT: Use system box2D #1951

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
MinyazevR wants to merge 7 commits into
base: master
Choose a base branch
from
Draft

DRAFT: Use system box2D #1951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3e84c32
Rename box2D.{so,dll,dylib} to trikBox2D.{so,dll,dylib}
MinyazevR Jul 7, 2025
260f998
Use trikBox2D in twoDModel.pri instead of Box2D
MinyazevR Jul 7, 2025
cd4cad3
Add use_system_box2D option
MinyazevR Jul 8, 2025
31f0d54
Dont use subdir box2D with use_system_box2D
MinyazevR Jul 8, 2025
e57107a
Use use_system_box2D for Ubuntu release build
MinyazevR Jul 8, 2025
b1aeda0
Fix library name for pkg-config
MinyazevR Jul 8, 2025
b5fa896
Merge branch 'master' into MinyazevR-use-system-box2D
MinyazevR Jul 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/common_build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:
os: ubuntu-22.04
build: true
build_installer: false
qmake_extra: "CONFIG+=tests CONFIG+=noPch CONFIG+=ccache CONFIG+=no-sanitizers CONFIG+=use_system_qscintilla2 CONFIG+=use_system_quazip"
qmake_extra: "CONFIG+=tests CONFIG+=noPch CONFIG+=ccache CONFIG+=no-sanitizers CONFIG+=use_system_box2D CONFIG+=use_system_qscintilla2 CONFIG+=use_system_quazip"
trik_python3_version_minor: 10
lint_clazy: true

Expand All @@ -103,7 +103,7 @@ jobs:
build: true
build_installer: false
config: debug
qmake_extra: "CONFIG+=tests CONFIG+=noPch CONFIG+=ccache CONFIG+=small_debug_info CONFIG+=use_system_qscintilla2 CONFIG+=use_system_quazip CONFIG+=sanitizer CONFIG+=sanitize_undefined CONFIG+=sanitize_address"
qmake_extra: "CONFIG+=tests CONFIG+=noPch CONFIG+=ccache CONFIG+=small_debug_info CONFIG+=use_system_box2D CONFIG+=use_system_qscintilla2 CONFIG+=use_system_quazip CONFIG+=sanitizer CONFIG+=sanitize_undefined CONFIG+=sanitize_address"
trik_python3_version_minor: 10

build-altlinux-release-tests:
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/setup_environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,9 @@ jobs:
if [[ "${{ inputs.qmake_extra }}" =~ "+=use_system_qscintilla2" ]]; then
rm -rf thirdparty/qscintilla
fi
if [[ "${{ inputs.qmake_extra }}" =~ "+=use_system_box2D" ]]; then
rm -rf plugins/robots/thirdparty/Box2D
fi
ls thirdparty

- name: Set up environment
Expand Down
2 changes: 1 addition & 1 deletion buildScripts/github/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ case "$(uname)" in
elif [ "$ID" = "ubuntu" ]; then
sudo apt-get update && sudo apt-get install -y --no-install-recommends ccache curl libusb-1.0-0-dev \
make qtscript5-dev qttools5-dev-tools qtmultimedia5-dev libqt5serialport5-dev libqt5svg5-dev \
libudev-dev "$TRIK_PYTHON"-dev qtbase5-private-dev qtwayland5 libqscintilla2-qt5-dev libquazip5-dev bear
libudev-dev "$TRIK_PYTHON"-dev qtbase5-private-dev qtwayland5 libqscintilla2-qt5-dev libquazip5-dev libbox2d-dev
elif [[ "$ID" = "rocky" || "$ID" = '"rocky"' ]]; then
GCC_VERSION=${GCC_VERSION:-13}
sudo yum update -y && sudo yum install -y --setopt=install_weak_deps=False epel-release
Expand Down
10 changes: 8 additions & 2 deletions plugins/robots/common/twoDModel/twoDModel.pri
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,20 @@
# limitations under the License.

QT += widgets xml svg
CONFIG *= link_pkgconfig

DEFINES += TWO_D_MODEL_LIBRARY
links(qrkernel qrutils qrgui-tool-plugin-interface qrgui-controller robots-utils robots-kit-base)

links(qrkernel qrutils qrgui-tool-plugin-interface qrgui-controller robots-utils robots-kit-base trikBox2D)
!use_system_box2D {
links(trikBox2D)
includes(plugins/robots/thirdparty/Box2D/Box2D)
} else {
PKGCONFIG *= box2d
}

includes(plugins/robots/common/kitBase)
includes(plugins/robots/utils qrtext)
includes(plugins/robots/thirdparty/Box2D/Box2D)

TRANSLATIONS = \
$$PWD/../../../../qrtranslations/ru/plugins/robots/twoDModel_ru.ts \
Expand Down
5 changes: 4 additions & 1 deletion plugins/robots/thirdparty/thirdparty.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,8 @@ TEMPLATE = subdirs
SUBDIRS += \
libusb-1.0 \
trikRuntime \
Box2D \
python \

!use_system_box2D {
SUBDIRS += Box2D
}
Loading