File tree Expand file tree Collapse file tree 6 files changed +7
-7
lines changed
installer/packages/trik-studio/ru.qreal.root.trik_studio_kernel/meta Expand file tree Collapse file tree 6 files changed +7
-7
lines changed Original file line number Diff line number Diff line change @@ -16,7 +16,7 @@ rsync -a "$BIN_DIR"/plugins/editors/librobotsMetamodel.so "$PW
1616rsync -a " $BIN_DIR " /librobots-interpreter-core.so* " $PWD " /../data/lib/
1717rsync -a " $BIN_DIR " /plugins/tools/librobots-plugin.so " $PWD " /../data/lib/plugins/tools/
1818rsync -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/
2020rsync -a " $BIN_DIR " /librobots-generator-base.so* " $PWD " /../data/lib/
2121rsync -a " $BIN_DIR " /librobots-kit-base.so* " $PWD " /../data/lib/
2222rsync -a " $BIN_DIR " /librobots-utils.so* " $PWD " /../data/lib/
Original file line number Diff line number Diff line change @@ -13,7 +13,7 @@ rsync -a "$BIN_DIR"/plugins/editors/librobotsMetamodel.dylib
1313rsync -a " $BIN_DIR " /plugins/tools/librobots-plugin.dylib " $BUNDLE_CONTENTS /Lib/plugins/tools/"
1414rsync -a " $BIN_DIR " /librobots-interpreter-core* .dylib " $BUNDLE_CONTENTS /Lib/"
1515rsync -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/"
1717rsync -a " $BIN_DIR " /librobots-generator-base* .dylib " $BUNDLE_CONTENTS /Lib/"
1818rsync -a " $BIN_DIR " /librobots-kit-base* .dylib " $BUNDLE_CONTENTS /Lib/"
1919rsync -a " $BIN_DIR " /librobots-utils* .dylib " $BUNDLE_CONTENTS /Lib/"
@@ -26,7 +26,7 @@ fix_qreal_dependencies "$BUNDLE_CONTENTS/Lib/plugins/editors/librobotsMetamodel.
2626fix_qreal_dependencies " $BUNDLE_CONTENTS /Lib/plugins/tools/librobots-plugin.dylib"
2727fix_qreal_dependencies " $BUNDLE_CONTENTS /Lib/librobots-interpreter-core.1.0.0.dylib"
2828fix_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"
3030fix_qreal_dependencies " $BUNDLE_CONTENTS /Lib/librobots-generator-base.1.0.0.dylib"
3131fix_qreal_dependencies " $BUNDLE_CONTENTS /Lib/librobots-kit-base.1.0.0.dylib"
3232fix_qreal_dependencies " $BUNDLE_CONTENTS /Lib/librobots-utils.1.0.0.dylib"
Original file line number Diff line number Diff line change @@ -9,7 +9,7 @@ rsync -a "$BIN_DIR"/plugins/editors/robotsMetamodel.dll "$PWD"
99rsync -a " $BIN_DIR " /robots-interpreter-core.dll " $PWD " /../data
1010rsync -a " $BIN_DIR " /plugins/tools/robots-plugin.dll " $PWD " /../data/plugins/tools/
1111rsync -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
1313rsync -a " $BIN_DIR " /robots-generator-base.dll " $PWD " /../data
1414rsync -a " $BIN_DIR " /robots-kit-base.dll " $PWD " /../data
1515rsync -a " $BIN_DIR " /robots-utils.dll " $PWD " /../data
Original file line number Diff line number Diff 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
138138rsync -av $qRealDir /librobots-ev3-kit.so* \
139139$qRealDir /librobots-utils.so* \
Original file line number Diff line number Diff line change @@ -16,7 +16,7 @@ QT += widgets xml svg
1616
1717DEFINES += 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
2121includes(plugins/robots/common/kitBase)
2222includes(plugins/robots/utils qrtext)
Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ TEMPLATE = lib
33include (../../../../global.pri )
44
55CONFIG += warn_off
6-
6+ TARGET = trikBox2D
77INCLUDEPATH += $$PWD /Box2D/include $$PWD /Box2D/src
88
99HEADERS = \
You can’t perform that action at this time.
0 commit comments