Skip to content

Commit 738219c

Browse files
authored
Rename box2D.{so,dll,dylib} to trikBox2D.{so,dll,dylib} (#1949)
* Rename box2D.{so,dll,dylib} to trikBox2D.{so,dll,dylib} * Use trikBox2D in twoDModel.pri instead of Box2D
1 parent 3ceb345 commit 738219c

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

installer/packages/trik-studio/ru.qreal.root.trik_studio_kernel/meta/prebuild-linux-gnu.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ rsync -a "$BIN_DIR"/plugins/editors/librobotsMetamodel.so "$PW
1616
rsync -a "$BIN_DIR"/librobots-interpreter-core.so* "$PWD"/../data/lib/
1717
rsync -a "$BIN_DIR"/plugins/tools/librobots-plugin.so "$PWD"/../data/lib/plugins/tools/
1818
rsync -a "$BIN_DIR"/librobots-2d-model.so* "$PWD"/../data/lib/
19-
rsync -a "$BIN_DIR"/libBox2D.so* "$PWD"/../data/lib/
19+
rsync -a "$BIN_DIR"/libtrikBox2D.so* "$PWD"/../data/lib/
2020
rsync -a "$BIN_DIR"/librobots-generator-base.so* "$PWD"/../data/lib/
2121
rsync -a "$BIN_DIR"/librobots-kit-base.so* "$PWD"/../data/lib/
2222
rsync -a "$BIN_DIR"/librobots-utils.so* "$PWD"/../data/lib/

installer/packages/trik-studio/ru.qreal.root.trik_studio_kernel/meta/prebuild-mac.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ rsync -a "$BIN_DIR"/plugins/editors/librobotsMetamodel.dylib
1313
rsync -a "$BIN_DIR"/plugins/tools/librobots-plugin.dylib "$BUNDLE_CONTENTS/Lib/plugins/tools/"
1414
rsync -a "$BIN_DIR"/librobots-interpreter-core*.dylib "$BUNDLE_CONTENTS/Lib/"
1515
rsync -a "$BIN_DIR"/librobots-2d-model*.dylib "$BUNDLE_CONTENTS/Lib/"
16-
rsync -a "$BIN_DIR"/libBox2D*.dylib "$BUNDLE_CONTENTS/Lib/"
16+
rsync -a "$BIN_DIR"/libtrikBox2D*.dylib "$BUNDLE_CONTENTS/Lib/"
1717
rsync -a "$BIN_DIR"/librobots-generator-base*.dylib "$BUNDLE_CONTENTS/Lib/"
1818
rsync -a "$BIN_DIR"/librobots-kit-base*.dylib "$BUNDLE_CONTENTS/Lib/"
1919
rsync -a "$BIN_DIR"/librobots-utils*.dylib "$BUNDLE_CONTENTS/Lib/"
@@ -26,7 +26,7 @@ fix_qreal_dependencies "$BUNDLE_CONTENTS/Lib/plugins/editors/librobotsMetamodel.
2626
fix_qreal_dependencies "$BUNDLE_CONTENTS/Lib/plugins/tools/librobots-plugin.dylib"
2727
fix_qreal_dependencies "$BUNDLE_CONTENTS/Lib/librobots-interpreter-core.1.0.0.dylib"
2828
fix_qreal_dependencies "$BUNDLE_CONTENTS/Lib/librobots-2d-model.1.0.0.dylib"
29-
fix_qreal_dependencies "$BUNDLE_CONTENTS/Lib/libBox2D.1.0.0.dylib"
29+
fix_qreal_dependencies "$BUNDLE_CONTENTS/Lib/libtrikBox2D.1.0.0.dylib"
3030
fix_qreal_dependencies "$BUNDLE_CONTENTS/Lib/librobots-generator-base.1.0.0.dylib"
3131
fix_qreal_dependencies "$BUNDLE_CONTENTS/Lib/librobots-kit-base.1.0.0.dylib"
3232
fix_qreal_dependencies "$BUNDLE_CONTENTS/Lib/librobots-utils.1.0.0.dylib"

installer/packages/trik-studio/ru.qreal.root.trik_studio_kernel/meta/prebuild-win32.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ rsync -a "$BIN_DIR"/plugins/editors/robotsMetamodel.dll "$PWD"
99
rsync -a "$BIN_DIR"/robots-interpreter-core.dll "$PWD"/../data
1010
rsync -a "$BIN_DIR"/plugins/tools/robots-plugin.dll "$PWD"/../data/plugins/tools/
1111
rsync -a "$BIN_DIR"/robots-2d-model.dll "$PWD"/../data
12-
rsync -a "$BIN_DIR"/Box2D.dll "$PWD"/../data
12+
rsync -a "$BIN_DIR"/trikBox2D.dll "$PWD"/../data
1313
rsync -a "$BIN_DIR"/robots-generator-base.dll "$PWD"/../data
1414
rsync -a "$BIN_DIR"/robots-kit-base.dll "$PWD"/../data
1515
rsync -a "$BIN_DIR"/robots-utils.dll "$PWD"/../data

plugins/robots/checker/scripts/build-checker-installer.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ $qRealDir/librobots-trik-kit-interpreter-common.so* \
133133
$qRealDir/librobots-kit-base.so* \
134134
$qRealDir/librobots-trik-kit.so* \
135135
$qRealDir/librobots-utils.so* \
136-
$qRealDir/libBox2D.so* .
136+
$qRealDir/libtrikBox2D.so* .
137137

138138
rsync -av $qRealDir/librobots-ev3-kit.so* \
139139
$qRealDir/librobots-utils.so* \

plugins/robots/common/twoDModel/twoDModel.pri

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ QT += widgets xml svg
1616

1717
DEFINES += TWO_D_MODEL_LIBRARY
1818

19-
links(qrkernel qrutils qrgui-tool-plugin-interface qrgui-controller robots-utils robots-kit-base Box2D)
19+
links(qrkernel qrutils qrgui-tool-plugin-interface qrgui-controller robots-utils robots-kit-base trikBox2D)
2020

2121
includes(plugins/robots/common/kitBase)
2222
includes(plugins/robots/utils qrtext)

plugins/robots/thirdparty/Box2D/Box2D.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ TEMPLATE = lib
33
include(../../../../global.pri)
44

55
CONFIG += warn_off
6-
6+
TARGET=trikBox2D
77
INCLUDEPATH += $$PWD/Box2D/include $$PWD/Box2D/src
88

99
HEADERS = \

0 commit comments

Comments
 (0)