Added qmake project files / standardized #includes

This commit is contained in:
Roland Winklmeier
2013-03-16 18:44:46 +01:00
parent 9b79949eb4
commit f6daa0623e
43 changed files with 577 additions and 61 deletions

View File

@@ -0,0 +1,52 @@
QT += network
TARGET = blackcore
TEMPLATE = lib
CONFIG += staticlib
INCLUDEPATH += ..
DEPENDPATH += . ..
#PRECOMPILED_HEADER = stdpch.h
precompile_header:!isEmpty(PRECOMPILED_HEADER) {
DEFINES += USING_PCH
}
DEFINES += LOG_IN_FILE
HEADERS += \
sim_callbacks.h \
constants.h \
fsd_protocol.h \
ecef.h \
fsd_client.h \
fsd_messages.h \
interpolator.h \
mathematics.h \
matrix_3d.h \
multiplayer.h \
ned.h \
plane.h \
simulator.h \
vector_3d.h \
vector_geo.h
SOURCES += \
ecef.cpp \
fsd_client.cpp \
fsd_messages.cpp \
interpolator.cpp \
mathematics.cpp \
matrix_3d.cpp \
multiplayer.cpp \
ned.cpp \
plane.cpp \
simulator.cpp \
vector_3d.cpp \
vector_geo.cpp
DESTDIR = ../../lib

View File

@@ -6,7 +6,7 @@
#ifndef CONSTANTS_H
#define CONSTANTS_H
#include "math.h"
#include "mathematics.h"
namespace BlackCore
{

View File

@@ -13,7 +13,7 @@
#include "blackcore/matrix_3d.h"
#include "blackcore/ned.h"
#include "blackcore/ecef.h"
#include "blackcore/math.h"
#include "blackcore/mathematics.h"
#include "blackcore/constants.h"
namespace BlackCore

View File

@@ -34,7 +34,7 @@ public:
CVectorGeo toGeodetic();
//! Assignment operator
void operator= (const CVector3D &rhs);
void operator= (const CVector3D &rhs);
};
} // namespace BlackCore

View File

@@ -4,8 +4,8 @@
#include <QStringList>
#include <QTextStream>
#include <blackcore/fsd_client.h>
#include <blackcore/fsd_messages.h>
#include "blackcore/fsd_client.h"
#include "blackcore/fsd_messages.h"
namespace FSD
{

View File

@@ -1,7 +1,7 @@
#include <iostream>
#include "blackcore/matrix_3d.h"
#include "blackcore/vector_geo.h"
#include "blackcore/math.h"
#include "blackcore/mathematics.h"
#include "blackcore/interpolator.h"
#include "blackcore/constants.h"
@@ -139,7 +139,7 @@ bool CInterpolator::stateNow(TPlaneState *state)
double vNorth = state->velNED.North();
double fraction = vNorth / vEast;
double heading = atan2 (vNorth, vEast);
double heading = atan2 (vNorth, vEast);
state->orientation.heading = heading * Constants::RadToDeg;

View File

@@ -5,7 +5,7 @@
#include <algorithm> // std::max
#include "blackcore/math.h"
#include "blackcore/mathematics.h"
namespace BlackCore {
@@ -30,4 +30,4 @@ double CMath::cubicRootReal(const double x)
return x < 0 ? -result : result;
}
} // namespace BlackCore
} // namespace BlackCore

View File

@@ -9,8 +9,8 @@
#include <QHash>
#include <QString>
#include <qglobal.h>
#include <blackmisc/message_system.h>
#include <blackcore/fsd_messages.h>
#include "blackmisc/message_system.h"
#include "blackcore/fsd_messages.h"
namespace BlackCore {

View File

@@ -1,6 +1,6 @@
#include <blackcore/interpolator.h>
#include <blackcore/simulator.h>
#include <blackmisc/debug.h>
#include "blackcore/interpolator.h"
#include "blackcore/simulator.h"
#include "blackmisc/debug.h"
#include "blackcore/plane.h"
namespace BlackCore {