Fixed build for windows systems

This commit is contained in:
Michaël Lemaire 2014-03-01 01:34:34 +01:00
parent b9ebf06188
commit 49564acc3c
21 changed files with 32 additions and 22 deletions

View file

@ -6,7 +6,7 @@
namespace paysages { namespace paysages {
namespace basics { namespace basics {
class Color class BASICSSHARED_EXPORT Color
{ {
public: public:
Color(); Color();

View file

@ -6,7 +6,7 @@
namespace paysages { namespace paysages {
namespace basics { namespace basics {
class Geometry class BASICSSHARED_EXPORT Geometry
{ {
public: public:
static double get2DAngle(double x, double y); static double get2DAngle(double x, double y);

View file

@ -2,6 +2,7 @@
#include <cmath> #include <cmath>
#include "PackStream.h" #include "PackStream.h"
#include "Vector3.h"
Matrix4::Matrix4(bool identity) Matrix4::Matrix4(bool identity)
{ {

View file

@ -3,7 +3,6 @@
#include "basics_global.h" #include "basics_global.h"
#include "Vector3.h"
#ifdef QT_GUI_LIB #ifdef QT_GUI_LIB
#include <QMatrix4x4> #include <QMatrix4x4>
#endif #endif

View file

@ -5,15 +5,13 @@
#include "Vector3.h" #include "Vector3.h"
namespace paysages namespace paysages {
{ namespace basics {
namespace basics
{
/*! /*!
* \brief A segment in 3D space (mainly useful for rays). * \brief A segment in 3D space (mainly useful for rays).
*/ */
class SpaceSegment class BASICSSHARED_EXPORT SpaceSegment
{ {
public: public:
SpaceSegment(const Vector3& start, const Vector3& end); SpaceSegment(const Vector3& start, const Vector3& end);

View file

@ -6,7 +6,7 @@
namespace paysages { namespace paysages {
namespace basics { namespace basics {
class Texture2D class BASICSSHARED_EXPORT Texture2D
{ {
public: public:
Texture2D(int xsize, int ysize); Texture2D(int xsize, int ysize);

View file

@ -6,7 +6,7 @@
namespace paysages { namespace paysages {
namespace basics { namespace basics {
class Texture3D class BASICSSHARED_EXPORT Texture3D
{ {
public: public:
Texture3D(int xsize, int ysize, int zsize); Texture3D(int xsize, int ysize, int zsize);

View file

@ -6,7 +6,7 @@
namespace paysages { namespace paysages {
namespace basics { namespace basics {
class Texture4D class BASICSSHARED_EXPORT Texture4D
{ {
public: public:
Texture4D(int xsize, int ysize, int zsize, int wsize); Texture4D(int xsize, int ysize, int zsize, int wsize);

View file

@ -29,4 +29,14 @@ namespace basics {
} }
using namespace paysages::basics; using namespace paysages::basics;
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif
#ifndef M_PI_2
#define M_PI_2 1.57079632679489661923
#endif
#ifndef M_PI_4
#define M_PI_4 0.78539816339744830962
#endif
#endif // BASICS_GLOBAL_H #endif // BASICS_GLOBAL_H

View file

@ -11,7 +11,7 @@
namespace paysages { namespace paysages {
namespace definition { namespace definition {
class AtmosphereDefinition : public BaseDefinition class DEFINITIONSHARED_EXPORT AtmosphereDefinition : public BaseDefinition
{ {
public: public:
typedef struct typedef struct

View file

@ -19,7 +19,7 @@ typedef struct
double zfar; double zfar;
} CameraPerspective; } CameraPerspective;
class BASICSSHARED_EXPORT CameraDefinition: public BaseDefinition class DEFINITIONSHARED_EXPORT CameraDefinition: public BaseDefinition
{ {
public: public:
CameraDefinition(); CameraDefinition();

View file

@ -8,7 +8,7 @@
namespace paysages { namespace paysages {
namespace definition { namespace definition {
class WaterDefinition: public BaseDefinition class DEFINITIONSHARED_EXPORT WaterDefinition: public BaseDefinition
{ {
public: public:
WaterDefinition(BaseDefinition* parent); WaterDefinition(BaseDefinition* parent);

View file

@ -6,7 +6,7 @@
namespace paysages { namespace paysages {
namespace preview { namespace preview {
class AtmosphereColorPreviewRenderer:public Base2dPreviewRenderer class PREVIEWSHARED_EXPORT AtmosphereColorPreviewRenderer:public Base2dPreviewRenderer
{ {
public: public:
AtmosphereColorPreviewRenderer(AtmosphereDefinition* definition, double heading); AtmosphereColorPreviewRenderer(AtmosphereDefinition* definition, double heading);

View file

@ -28,7 +28,7 @@ public:
bool value; bool value;
}; };
class BasePreview : public DrawingWidget class PREVIEWSHARED_EXPORT BasePreview : public DrawingWidget
{ {
Q_OBJECT Q_OBJECT

View file

@ -11,7 +11,7 @@ class QPainter;
namespace paysages { namespace paysages {
namespace preview { namespace preview {
class DrawingWidget : public QWidget class PREVIEWSHARED_EXPORT DrawingWidget : public QWidget
{ {
Q_OBJECT Q_OBJECT
public: public:

View file

@ -9,7 +9,7 @@ class QImage;
namespace paysages { namespace paysages {
namespace preview { namespace preview {
class PreviewOsd class PREVIEWSHARED_EXPORT PreviewOsd
{ {
public: public:
PreviewOsd(); PreviewOsd();

View file

@ -8,7 +8,7 @@
namespace paysages { namespace paysages {
namespace preview { namespace preview {
class PreviewOsdItem:public QImage class PREVIEWSHARED_EXPORT PreviewOsdItem:public QImage
{ {
public: public:
PreviewOsdItem(int width, int height); PreviewOsdItem(int width, int height);

View file

@ -8,7 +8,7 @@
namespace paysages { namespace paysages {
namespace preview { namespace preview {
class TerrainShapePreviewRenderer : public Base2dPreviewRenderer class PREVIEWSHARED_EXPORT TerrainShapePreviewRenderer : public Base2dPreviewRenderer
{ {
public: public:
explicit TerrainShapePreviewRenderer(TerrainDefinition* terrain); explicit TerrainShapePreviewRenderer(TerrainDefinition* terrain);

View file

@ -11,7 +11,7 @@ namespace software {
/*! /*!
* \brief Abstract class for all cloud models (cirrus, cumulus...). * \brief Abstract class for all cloud models (cirrus, cumulus...).
*/ */
class BaseCloudsModel class SOFTWARESHARED_EXPORT BaseCloudsModel
{ {
public: public:
BaseCloudsModel(CloudLayerDefinition *layer); BaseCloudsModel(CloudLayerDefinition *layer);

View file

@ -9,7 +9,7 @@ namespace system {
/*! /*!
* Pool to handle a group of threads doing the same task. * Pool to handle a group of threads doing the same task.
*/ */
class ParallelPool class SYSTEMSHARED_EXPORT ParallelPool
{ {
public: public:
ParallelPool(); ParallelPool();

View file

@ -1,7 +1,9 @@
#ifndef SYSTEM_GLOBAL_H #ifndef SYSTEM_GLOBAL_H
#define SYSTEM_GLOBAL_H #define SYSTEM_GLOBAL_H
#ifndef __MINGW32__
#define PAYSAGES_USE_INLINING 1 #define PAYSAGES_USE_INLINING 1
#endif
#include <QtCore/qglobal.h> #include <QtCore/qglobal.h>
#if defined(SYSTEM_LIBRARY) #if defined(SYSTEM_LIBRARY)