blacklib folder reorganisation

src/driver/CMakeLists.txt

@@ -0,0 +1,3 @@
+IF(WITH_DRIVER_FSX)
+	ADD_SUBDIRECTORY(fsx)
+ENDIF(WITH_DRIVER_FSX)

src/driver/fs9/driver_fs9.cpp

@@ -0,0 +1,33 @@
+#include "driver_fs9.h"
+
+extern "C"
+{
+    Q_DECL_EXPORT ISimulator* BB_createISimulatorInstance ()
+    {
+        return new CDriverFSX;
+    }
+
+    Q_DECL_EXPORT quint32 BB_InterfaceVersionMajor ()
+    {
+        return ISimulator::InterfaceVersionMajor;
+    }
+
+    Q_DECL_EXPORT quint32 BB_InterfaceVersionMinor ()
+    {
+        return ISimulator::InterfaceVersionMinor;
+    }
+}
+
+
+CDriverFS9::CDriverFS9()
+{
+}
+
+void CDriverFS9::setLibraryContext(BlackMisc::IContext *context)
+{
+#ifdef Q_OS_WIN
+    bAssert(!BlackMisc::IContext::isContextInitialised());
+#endif
+
+    m_libraryContext = new BlackMisc::CLibraryContext(*context);
+}

src/driver/fs9/driver_fs9.h

@@ -0,0 +1,17 @@
+#ifndef DRIVER_FS9_H
+#define DRIVER_FS9_H
+
+#include <simulator.h>
+
+class CDriverFS9 : public ISimulator
+{
+public:
+    CDriverFS9();
+    virtual int init() { return 1;}
+	
+protected:
+
+    BlackMisc::CLibraryContext *m_libraryContext;
+};
+
+#endif // DRIVER_FS9_H

src/driver/fsx/CMakeLists.txt

@@ -0,0 +1,20 @@
+FILE(GLOB driver_fsx_SOURCES *.cpp)
+FILE(GLOB driver_fsx_HEADERS *.h)
+SET(driver_fsx_HEADERS_QOBJECT )
+		
+QT4_WRAP_CPP(driver_fsx_HEADERS_MOC ${driver_fsx_HEADERS_QOBJECT})
+
+SOURCE_GROUP(QtGeneratedMocSrc FILES ${driver_fsx_HEADERS_MOC})
+SOURCE_GROUP (Headers FILES ${driver_fsx_HEADERS})
+
+INCLUDE_DIRECTORIES(${SIMCONNECT_INCLUDE_DIR})
+LINK_DIRECTORIES(${SIMCONNECT_LIBRARY_DIR})
+
+IF(WITH_STATIC_DRIVERS)
+    ADD_LIBRARY(bb_driver_fsx STATIC ${driver_fsx_SOURCES} ${driver_fsx_HEADERS_MOC} )
+ELSE(WITH_STATIC_DRIVERS)
+    ADD_LIBRARY(bb_driver_fsx SHARED ${driver_fsx_SOURCES} ${driver_fsx_HEADERS_MOC} )
+ENDIF(WITH_STATIC_DRIVERS)
+
+TARGET_LINK_LIBRARIES(bb_driver_fsx blackmisc blackcore SimConnect.lib ${QT_LIBRARIES})
+SET_TARGET_PROPERTIES(bb_driver_fsx PROPERTIES PROJECT_LABEL "Driver - FSX")

src/driver/fsx/driver_fsx.cpp

@@ -0,0 +1,50 @@
+/***************************************************************************
+ *   Copyright (C) 2013 by Roland Winklmeier                               *
+ *   roland.m.winklmeier@googlemail.com                                    *
+ *                                                                         *
+ *   For license information see LICENSE in the root folder of the         *
+ *   source code.                                                          *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU Lesser General Public License for more details.                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include <QtCore/qglobal.h>
+
+#include <blackmisc/debug.h>
+#include "driver_fsx.h"
+
+extern "C"
+{
+    Q_DECL_EXPORT ISimulator* BB_createISimulatorInstance ()
+    {
+        return new CDriverFSX;
+    }
+
+    Q_DECL_EXPORT quint32 BB_InterfaceVersionMajor ()
+    {
+        return ISimulator::InterfaceVersionMajor;
+    }
+
+    Q_DECL_EXPORT quint32 BB_InterfaceVersionMinor ()
+    {
+        return ISimulator::InterfaceVersionMinor;
+    }
+}
+
+CDriverFSX::CDriverFSX()
+{
+
+}
+
+void CDriverFSX::setLibraryContext(BlackMisc::IContext *context)
+{
+#ifdef Q_OS_WIN
+    bAssert(!BlackMisc::IContext::isContextInitialised());
+#endif
+
+    m_libraryContext = new BlackMisc::CLibraryContext(*context);
+}

src/driver/fsx/driver_fsx.h

@@ -0,0 +1,35 @@
+/***************************************************************************
+ *   Copyright (C) 2013 by Roland Winklmeier                               *
+ *   roland.m.winklmeier@googlemail.com                                    *
+ *                                                                         *
+ *   For license information see LICENSE in the root folder of the         *
+ *   source code.                                                          *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU Lesser General Public License for more details.                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef DRIVER_FSX_H
+#define DRIVER_FSX_H
+
+#include <blackmisc/context.h>
+#include <blackcore/simulator.h>
+
+class CDriverFSX : public BlackCore::ISimulator
+{
+public:
+    CDriverFSX();
+
+    virtual void setLibraryContext(BlackMisc::IContext *context);
+
+    virtual int init() { return 0; }
+
+protected:
+
+    BlackMisc::CLibraryContext *m_libraryContext;
+};
+
+#endif // DRIVER_FSX_H

src/driver/xplane/driver_xplane.cpp

@@ -0,0 +1,23 @@
+#include "driver_xplane.h"
+
+extern "C"
+{
+    Q_DECL_EXPORT ISimulator* BB_createISimulatorInstance ()
+    {
+        return new CDriverXPlane;
+    }
+}
+
+
+CDriverXPlane::CDriverXPlane()
+{
+}
+
+void CDriverFSX::setLibraryContext(BlackMisc::IContext *context)
+{
+#ifdef Q_OS_WIN
+    bAssert(!BlackMisc::IContext::isContextInitialised());
+#endif
+
+    m_libraryContext = new BlackMisc::CLibraryContext(*context);
+}

src/driver/xplane/driver_xplane.h

@@ -0,0 +1,17 @@
+#ifndef DRIVER_XPLANE_H
+#define DRIVER_XPLANE_H
+
+#include <simulator.h>
+
+class CDriverXPlane : public ISimulator
+{
+public:
+    CDriverXPlane();
+    virtual int init() {return 1;}
+	
+protected:
+
+    BlackMisc::CLibraryContext *m_libraryContext;
+};
+
+#endif // DRIVER_XPLANE_H