From 15fb87ecd04346f61e1b02201345433cdb0ad197 Mon Sep 17 00:00:00 2001
From: Roland Winklmeier <Roland.M.Winklmeier@gmail.com>
Date: Fri, 18 Apr 2014 14:36:23 +0200
Subject: [PATCH] Move xplane bus project into top source directory

refs #211
---
 client.pro                              |  2 +-
 src/{blacksim/xplane => }/xbus/main.cpp |  0
 src/{blacksim/xplane => }/xbus/stub.h   |  0
 src/{blacksim/xplane => }/xbus/utils.h  |  0
 src/{blacksim/xplane => }/xbus/xbus.pro | 28 ++++++++++++-------------
 5 files changed, 15 insertions(+), 15 deletions(-)
 rename src/{blacksim/xplane => }/xbus/main.cpp (100%)
 rename src/{blacksim/xplane => }/xbus/stub.h (100%)
 rename src/{blacksim/xplane => }/xbus/utils.h (100%)
 rename src/{blacksim/xplane => }/xbus/xbus.pro (70%)

diff --git a/client.pro b/client.pro
index 5fe70117d..e66688130 100644
--- a/client.pro
+++ b/client.pro
@@ -19,7 +19,7 @@ contains(BLACK_CONFIG, BlackSim) {
     }
 
     contains(BLACK_CONFIG, XPlane) {
-        SUBDIRS += src/blacksim/xplane/xbus/xbus.pro
+        SUBDIRS += src/xbus/xbus.pro
         SUBDIRS += src/plugins/simulator/xplane/plugin_xplane.pro
     }
 }
diff --git a/src/blacksim/xplane/xbus/main.cpp b/src/xbus/main.cpp
similarity index 100%
rename from src/blacksim/xplane/xbus/main.cpp
rename to src/xbus/main.cpp
diff --git a/src/blacksim/xplane/xbus/stub.h b/src/xbus/stub.h
similarity index 100%
rename from src/blacksim/xplane/xbus/stub.h
rename to src/xbus/stub.h
diff --git a/src/blacksim/xplane/xbus/utils.h b/src/xbus/utils.h
similarity index 100%
rename from src/blacksim/xplane/xbus/utils.h
rename to src/xbus/utils.h
diff --git a/src/blacksim/xplane/xbus/xbus.pro b/src/xbus/xbus.pro
similarity index 70%
rename from src/blacksim/xplane/xbus/xbus.pro
rename to src/xbus/xbus.pro
index 7e665dc30..b1d4cd361 100644
--- a/src/blacksim/xplane/xbus/xbus.pro
+++ b/src/xbus/xbus.pro
@@ -1,5 +1,5 @@
-include (../../../../config.pri)
-include (../../../../build.pri)
+include (../../config.pri)
+include (../../build.pri)
 
 QT       += core gui widgets dbus network
 
@@ -10,8 +10,8 @@ CONFIG += blackmisc
 
 LIBS += -lXPLM
 
-DEPENDPATH += . ../../../../src
-INCLUDEPATH += . ../../../../src
+DEPENDPATH += . ../../src
+INCLUDEPATH += . ../../src
 
 SOURCES += *.cpp
 HEADERS += *.h
@@ -33,39 +33,39 @@ win32:TARGET = win
 linux:TARGET = lin
 macx:TARGET = mac
 win32:contains(QMAKE_TARGET.arch, x86_64) {
-    DESTDIR = ../../../../xbus/64
+    DESTDIR = ../../xbus/64
 }
 win32:contains(QMAKE_TARGET.arch, x86) {
-    DESTDIR = ../../../../xbus
+    DESTDIR = ../../xbus
 }
 win32-g++ {
     WIN_FIND = $$(SYSTEMROOT)\system32\find
     MINGW64 = $$system($$QMAKE_CXX -Q --help=target | $$WIN_FIND \"-m64\")
     contains(MINGW64,[enabled]) {
-        DESTDIR = ../../../../xbus/64
+        DESTDIR = ../../xbus/64
     }
     else {
-        DESTDIR = ../../../../xbus
+        DESTDIR = ../../xbus
     }
 }
 linux-g++ {
     GCC64 = $$system($$QMAKE_CXX -Q --help=target | grep m64)
     contains(GCC64,[enabled]) {
-        DESTDIR = ../../../../xbus/64
+        DESTDIR = ../../xbus/64
     }
     else {
-        DESTDIR = ../../../../xbus
+        DESTDIR = ../../xbus
     }
 }
 linux-g++-64 {
-    DESTDIR = ../../../../xbus/64
+    DESTDIR = ../../xbus/64
 }
 linux-g++-32 {
-    DESTDIR = ../../../../xbus
+    DESTDIR = ../../xbus
 }
 macx {
     # a single dylib file contains both 32bit and 64bit binaries
-    DESTDIR = ../../../../xbus
+    DESTDIR = ../../xbus
 }
 
-include (../../../../libraries.pri)
+include (../../libraries.pri)