flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-20 12:35:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move xplane bus project into top source directory

Browse Source 
refs #211
This commit is contained in:
Roland Winklmeier
2014-04-18 14:36:23 +02:00
parent cdbc635361
commit 15fb87ecd0
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client.pro
View File

@@ -19,7 +19,7 @@ contains(BLACK_CONFIG, BlackSim) {
} }
contains(BLACK_CONFIG, XPlane) { contains(BLACK_CONFIG, XPlane) {
SUBDIRS += src/blacksim/xplane/xbus/xbus.pro SUBDIRS += src/xbus/xbus.pro
SUBDIRS += src/plugins/simulator/xplane/plugin_xplane.pro SUBDIRS += src/plugins/simulator/xplane/plugin_xplane.pro
} }
} }

0
src/blacksim/xplane/xbus/main.cpp → src/xbus/main.cpp
View File

0
src/blacksim/xplane/xbus/stub.h → src/xbus/stub.h
View File

0
src/blacksim/xplane/xbus/utils.h → src/xbus/utils.h
View File

28
src/blacksim/xplane/xbus/xbus.pro → src/xbus/xbus.pro
View File

@@ -1,5 +1,5 @@
include (../../../../config.pri) include (../../config.pri)
include (../../../../build.pri) include (../../build.pri)
QT += core gui widgets dbus network QT += core gui widgets dbus network
@@ -10,8 +10,8 @@ CONFIG += blackmisc
LIBS += -lXPLM LIBS += -lXPLM
DEPENDPATH += . ../../../../src DEPENDPATH += . ../../src
INCLUDEPATH += . ../../../../src INCLUDEPATH += . ../../src
SOURCES += *.cpp SOURCES += *.cpp
HEADERS += *.h HEADERS += *.h
@@ -33,39 +33,39 @@ win32:TARGET = win
linux:TARGET = lin linux:TARGET = lin
macx:TARGET = mac macx:TARGET = mac
win32:contains(QMAKE_TARGET.arch, x86_64) { win32:contains(QMAKE_TARGET.arch, x86_64) {
DESTDIR = ../../../../xbus/64 DESTDIR = ../../xbus/64
} }
win32:contains(QMAKE_TARGET.arch, x86) { win32:contains(QMAKE_TARGET.arch, x86) {
DESTDIR = ../../../../xbus DESTDIR = ../../xbus
} }
win32-g++ { win32-g++ {
WIN_FIND = $$(SYSTEMROOT)\system32\find WIN_FIND = $$(SYSTEMROOT)\system32\find
MINGW64 = $$system($$QMAKE_CXX -Q --help=target | $$WIN_FIND \"-m64\") MINGW64 = $$system($$QMAKE_CXX -Q --help=target | $$WIN_FIND \"-m64\")
contains(MINGW64,[enabled]) { contains(MINGW64,[enabled]) {
DESTDIR = ../../../../xbus/64 DESTDIR = ../../xbus/64
} }
else { else {
DESTDIR = ../../../../xbus DESTDIR = ../../xbus
} }
} }
linux-g++ { linux-g++ {
GCC64 = $$system($$QMAKE_CXX -Q --help=target | grep m64) GCC64 = $$system($$QMAKE_CXX -Q --help=target | grep m64)
contains(GCC64,[enabled]) { contains(GCC64,[enabled]) {
DESTDIR = ../../../../xbus/64 DESTDIR = ../../xbus/64
} }
else { else {
DESTDIR = ../../../../xbus DESTDIR = ../../xbus
} }
} }
linux-g++-64 { linux-g++-64 {
DESTDIR = ../../../../xbus/64 DESTDIR = ../../xbus/64
} }
linux-g++-32 { linux-g++-32 {
DESTDIR = ../../../../xbus DESTDIR = ../../xbus
} }
macx { macx {
# a single dylib file contains both 32bit and 64bit binaries # a single dylib file contains both 32bit and 64bit binaries
DESTDIR = ../../../../xbus DESTDIR = ../../xbus
} }
include (../../../../libraries.pri) include (../../libraries.pri)