From 07879cf5a7e9fa4339292637a28a4fd3d76324db Mon Sep 17 00:00:00 2001 From: Roland Winklmeier Date: Fri, 7 Feb 2014 22:39:40 +0100 Subject: [PATCH] Remove dummy simulator driver projects refs #90 --- client.pro | 3 -- src/driver/CMakeLists.txt | 3 -- src/driver/fs9/driver_fs9.cpp | 33 ------------------- src/driver/fs9/driver_fs9.h | 17 ---------- src/driver/fs9/driver_fs9.pro | 17 ---------- src/driver/fsx/CMakeLists.txt | 20 ------------ src/driver/fsx/driver_fsx.cpp | 49 ----------------------------- src/driver/fsx/driver_fsx.h | 35 --------------------- src/driver/fsx/driver_fsx.pro | 17 ---------- src/driver/xplane/driver_xplane.cpp | 31 ------------------ src/driver/xplane/driver_xplane.h | 15 --------- src/driver/xplane/driver_xplane.pro | 17 ---------- 12 files changed, 257 deletions(-) delete mode 100644 src/driver/CMakeLists.txt delete mode 100644 src/driver/fs9/driver_fs9.cpp delete mode 100644 src/driver/fs9/driver_fs9.h delete mode 100644 src/driver/fs9/driver_fs9.pro delete mode 100644 src/driver/fsx/CMakeLists.txt delete mode 100644 src/driver/fsx/driver_fsx.cpp delete mode 100644 src/driver/fsx/driver_fsx.h delete mode 100644 src/driver/fsx/driver_fsx.pro delete mode 100644 src/driver/xplane/driver_xplane.cpp delete mode 100644 src/driver/xplane/driver_xplane.h delete mode 100644 src/driver/xplane/driver_xplane.pro diff --git a/client.pro b/client.pro index 9a18458c7..962a93d8d 100644 --- a/client.pro +++ b/client.pro @@ -11,9 +11,6 @@ WITH_BLACKSOUND = ON WITH_SAMPLES = ON WITH_UNITTESTS = ON -#WITH_DRIVER_FSX = ON -#WITH_DRIVER_FS9 = ON -#WITH_DRIVER_XPLANE = ON #WITH_DOXYGEN = ON equals(WITH_BLACKMISC, ON) { diff --git a/src/driver/CMakeLists.txt b/src/driver/CMakeLists.txt deleted file mode 100644 index 397430dc9..000000000 --- a/src/driver/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -IF(WITH_DRIVER_FSX) - ADD_SUBDIRECTORY(fsx) -ENDIF(WITH_DRIVER_FSX) diff --git a/src/driver/fs9/driver_fs9.cpp b/src/driver/fs9/driver_fs9.cpp deleted file mode 100644 index 3e6096209..000000000 --- a/src/driver/fs9/driver_fs9.cpp +++ /dev/null @@ -1,33 +0,0 @@ -#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); -} diff --git a/src/driver/fs9/driver_fs9.h b/src/driver/fs9/driver_fs9.h deleted file mode 100644 index a77a39c5e..000000000 --- a/src/driver/fs9/driver_fs9.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef DRIVER_FS9_H -#define DRIVER_FS9_H - -#include - -class CDriverFS9 : public ISimulator -{ -public: - CDriverFS9(); - virtual int init() { return 1;} - -protected: - - BlackMisc::CLibraryContext *m_libraryContext; -}; - -#endif // DRIVER_FS9_H diff --git a/src/driver/fs9/driver_fs9.pro b/src/driver/fs9/driver_fs9.pro deleted file mode 100644 index ed91f1d0a..000000000 --- a/src/driver/fs9/driver_fs9.pro +++ /dev/null @@ -1,17 +0,0 @@ -TARGET = bb_driver_fs9 -TEMPLATE = lib -CONFIG += dll c++11 - -INCLUDEPATH += .. ../../ - -DESTDIR = ../../../bin - -DEPENDPATH += . - -HEADERS += *.h - -SOURCES += *.cpp - - - - diff --git a/src/driver/fsx/CMakeLists.txt b/src/driver/fsx/CMakeLists.txt deleted file mode 100644 index bb9a16c8d..000000000 --- a/src/driver/fsx/CMakeLists.txt +++ /dev/null @@ -1,20 +0,0 @@ -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") \ No newline at end of file diff --git a/src/driver/fsx/driver_fsx.cpp b/src/driver/fsx/driver_fsx.cpp deleted file mode 100644 index 989f07c34..000000000 --- a/src/driver/fsx/driver_fsx.cpp +++ /dev/null @@ -1,49 +0,0 @@ -/*************************************************************************** - * 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 - -#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); -} diff --git a/src/driver/fsx/driver_fsx.h b/src/driver/fsx/driver_fsx.h deleted file mode 100644 index e2eda0ace..000000000 --- a/src/driver/fsx/driver_fsx.h +++ /dev/null @@ -1,35 +0,0 @@ -/*************************************************************************** - * 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 -#include - -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 diff --git a/src/driver/fsx/driver_fsx.pro b/src/driver/fsx/driver_fsx.pro deleted file mode 100644 index 98f2cfdc8..000000000 --- a/src/driver/fsx/driver_fsx.pro +++ /dev/null @@ -1,17 +0,0 @@ -TARGET = bb_driver_fsx -TEMPLATE = lib -CONFIG += dll c++11 - -INCLUDEPATH += .. ../../ - -DESTDIR = ../../../bin - -DEPENDPATH += . - -HEADERS += *.h - -SOURCES += *.cpp - - - - diff --git a/src/driver/xplane/driver_xplane.cpp b/src/driver/xplane/driver_xplane.cpp deleted file mode 100644 index 09d003ea1..000000000 --- a/src/driver/xplane/driver_xplane.cpp +++ /dev/null @@ -1,31 +0,0 @@ -#include "driver_xplane.h" - -extern "C" -{ - Q_DECL_EXPORT ISimulator* BB_createISimulatorInstance() - { - return new CDriverXPlane; - } -} - -CDriverXPlane::CDriverXPlane() -{ -} - -CDriverXPlane::~CDriverXPlane() -{ -} - -int CDriverXPlane::init() -{ - return 1; -} - -void CDriverXPlane::setLibraryContext(BlackMisc::IContext *context) -{ -#ifdef Q_OS_WIN - bAssert(!BlackMisc::IContext::isContextInitialised()); -#endif - - mLibraryContext = new BlackMisc::CLibraryContext(*context); -} diff --git a/src/driver/xplane/driver_xplane.h b/src/driver/xplane/driver_xplane.h deleted file mode 100644 index c707aba48..000000000 --- a/src/driver/xplane/driver_xplane.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef DRIVER_XPLANE_H -#define DRIVER_XPLANE_H - -#include - -class CDriverXPlane : public ISimulator -{ -public: - CDriverXPlane(); - virtual ~CDriverXPlane(); - - virtual int init(); -}; - -#endif // DRIVER_XPLANE_H diff --git a/src/driver/xplane/driver_xplane.pro b/src/driver/xplane/driver_xplane.pro deleted file mode 100644 index 21a93cfe0..000000000 --- a/src/driver/xplane/driver_xplane.pro +++ /dev/null @@ -1,17 +0,0 @@ -TARGET = bb_driver_xplane -TEMPLATE = lib -CONFIG += dll c++11 - -INCLUDEPATH += .. ../../ - -DESTDIR = ../../../bin - -DEPENDPATH += . - -HEADERS += *.h - -SOURCES += *.cpp - - - -