Skip to content

Commit 717c244

Browse files
committed
Fixed connection issue & docker / ci build
1 parent b695ff2 commit 717c244

File tree

5 files changed

+11
-6
lines changed

5 files changed

+11
-6
lines changed

ExtPlane.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ versionAtLeast(QT_VERSION, 5.8.0) {
1818
warning(Qt 5.8.0 needed to build extplane-transformer - skipping $$QT_VERSION)
1919
}
2020

21-
OTHER_FILES += README.md clients/extplane-client-qt/README
21+
OTHER_FILES += README.md clients/extplane-client-qt/README Dockerfile scripts/*

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ binaries.
9494
docker build -t extplane .
9595
docker run -it -v $PWD:/ExtPlane -w /ExtPlane extplane ./scripts/ci-build.sh
9696
```
97+
You should end up with extplane-transformer.zip and extplane-plugin.zip with both linux & windows versions inside.
9798

9899
### Debian/Ubuntu Linux ###
99100
```bash

clients/extplane-client-qt/simulatedextplaneconnection.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ void SimulatedExtPlaneConnection::stopConnection() {
2727
emit connectionMessage("Stopped simulated");
2828
}
2929

30+
void SimulatedExtPlaneConnection::connectionChangedSlot() { // Host or port changed -reconnect
31+
}
32+
3033
void SimulatedExtPlaneConnection::keyPress(int id) {
3134
emit connectionMessage(QString("Simulated key press id %1").arg(id));
3235
}

clients/extplane-client-qt/simulatedextplaneconnection.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ public slots:
2929

3030
private slots:
3131
void tickTime();
32+
virtual void connectionChangedSlot();
33+
3234
private:
3335
virtual void writeLine(QString line);
3436
virtual ClientDataRef *createDataRef(QString name, double accuracy=0);

scripts/cross-compile-win64-from-lin.sh

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
# Good luck!
2222
#
2323

24-
if [ ! -d ../ExtPlane-Panel ] ; then
25-
echo "Run this from ExtPlane-Panel subdirectory is. Read the comments in script."
24+
if [ ! -d ../ExtPlane ] ; then
25+
echo "Run this from ExtPlane subdirectory is. Read the comments in script."
2626
exit -1
2727
fi
2828
echo "Cleaning up build dir"
@@ -33,7 +33,7 @@ if [ -d ../mxe ] ; then
3333
MXEDIR=`pwd`/../mxe
3434
else
3535
if [ -d /usr/lib/mxe ] ; then
36-
MXEDIR = /usr/lib/mxe
36+
MXEDIR=/usr/lib/mxe
3737
fi
3838
fi
3939

@@ -54,8 +54,7 @@ popd
5454
PATH=$MXEDIR/usr/bin/:$PATH
5555

5656
echo
57-
echo Starting ExtPlane-Panel build
57+
echo Starting ExtPlane build
5858
echo $PATH
5959
$MXEDIR/usr/$TARGET/qt5/bin/qmake "CONFIG+=release" -recursive
6060
make
61-

0 commit comments

Comments
 (0)