Skip to content

Commit

Permalink
Compile all dataref classes in plugin. Should fix #44.
Browse files Browse the repository at this point in the history
  • Loading branch information
vranki committed Jan 2, 2019
1 parent 43465cb commit 14b351b
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 25 deletions.
27 changes: 25 additions & 2 deletions common.pri
Original file line number Diff line number Diff line change
@@ -1,6 +1,29 @@
exists($$PWD/../XPlaneSDK) {
XPLANE_SDK_PATH=$$PWD/../XPlaneSDK
XPLANE_SDK_PATH=$$PWD/../XPlaneSDK
}
exists($$(HOME)/SDK/) {
XPLANE_SDK_PATH=$$(HOME)/SDK/
XPLANE_SDK_PATH=$$(HOME)/SDK/
}

# Build all the dataref classes as they are needed
# everywhere.

SOURCES += \
$$PWD/extplane-server/datarefprovider.cpp \
$$PWD/extplane-server/datarefs/dataref.cpp \
$$PWD/extplane-server/datarefs/floatdataref.cpp \
$$PWD/extplane-server/datarefs/floatarraydataref.cpp \
$$PWD/extplane-server/datarefs/intdataref.cpp \
$$PWD/extplane-server/datarefs/doubledataref.cpp \
$$PWD/extplane-server/datarefs/intarraydataref.cpp \
$$PWD/extplane-server/datarefs/datadataref.cpp

HEADERS += \
$$PWD/extplane-server/datarefprovider.h \
$$PWD/extplane-server/datarefs/dataref.h \
$$PWD/extplane-server/datarefs/floatdataref.h \
$$PWD/extplane-server/datarefs/floatarraydataref.h \
$$PWD/extplane-server/datarefs/intdataref.h \
$$PWD/extplane-server/datarefs/doubledataref.h \
$$PWD/extplane-server/datarefs/intarraydataref.h \
$$PWD/extplane-server/datarefs/datadataref.h
2 changes: 0 additions & 2 deletions extplane-plugin/extplane-plugin.pro
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,9 @@ QMAKE_POST_LINK += $(MKDIR) $$XPLDIR ; $(COPY_FILE) $(TARGET) $$XPLDIR/$$XPLFILE

SOURCES += main.cpp \
xplaneplugin.cpp \
../extplane-server/datarefprovider.cpp \
customdata/navcustomdata.cpp \
customdata/atccustomdata.cpp
HEADERS += \
xplaneplugin.h \
../extplane-server/datarefprovider.h \
customdata/navcustomdata.h \
customdata/atccustomdata.h \
4 changes: 0 additions & 4 deletions extplane-server/datarefprovider.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
#include "datarefprovider.h"
#include "datarefs/dataref.h"
#include "datarefs/floatdataref.h"
#include "datarefs/floatarraydataref.h"
#include "console.h"

DataRefProvider::DataRefProvider() {}

Expand Down
20 changes: 3 additions & 17 deletions extplane-server/extplane-server.pro
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
TEMPLATE = lib
CONFIG += staticlib c++11

include(../common.pri)

# Needed for windows mxe build (hope this doesn't break anything..)
DESTDIR = $$PWD

Expand All @@ -10,25 +12,9 @@ QT -= gui
INCLUDEPATH += $$PWD/../util/

SOURCES += tcpserver.cpp \
tcpclient.cpp \
datarefprovider.cpp \
datarefs/dataref.cpp \
datarefs/floatdataref.cpp \
datarefs/floatarraydataref.cpp \
datarefs/intdataref.cpp \
datarefs/doubledataref.cpp \
datarefs/intarraydataref.cpp \
datarefs/datadataref.cpp
tcpclient.cpp

HEADERS += \
tcpserver.h \
tcpclient.h \
datarefprovider.h \
datarefs/dataref.h \
datarefs/floatdataref.h \
datarefs/floatarraydataref.h \
datarefs/intdataref.h \
datarefs/doubledataref.h \
datarefs/intarraydataref.h \
datarefs/datadataref.h \
../util/console.h

0 comments on commit 14b351b

Please sign in to comment.