From 49564acc3c521a2f89b8f569ee14c0ebcbdb034c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Lemaire?= Date: Sat, 1 Mar 2014 01:34:34 +0100 Subject: [PATCH] Fixed build for windows systems --- src/basics/Color.h | 2 +- src/basics/Geometry.h | 2 +- src/basics/Matrix4.cpp | 1 + src/basics/Matrix4.h | 1 - src/basics/SpaceSegment.h | 8 +++----- src/basics/Texture2D.h | 2 +- src/basics/Texture3D.h | 2 +- src/basics/Texture4D.h | 2 +- src/basics/basics_global.h | 10 ++++++++++ src/definition/AtmosphereDefinition.h | 2 +- src/definition/CameraDefinition.h | 2 +- src/definition/WaterDefinition.h | 2 +- src/render/preview/AtmosphereColorPreviewRenderer.h | 2 +- src/render/preview/BasePreview.h | 2 +- src/render/preview/DrawingWidget.h | 2 +- src/render/preview/PreviewOsd.h | 2 +- src/render/preview/PreviewOsdItem.h | 2 +- src/render/preview/TerrainShapePreviewRenderer.h | 2 +- src/render/software/clouds/BaseCloudsModel.h | 2 +- src/system/ParallelPool.h | 2 +- src/system/system_global.h | 2 ++ 21 files changed, 32 insertions(+), 22 deletions(-) diff --git a/src/basics/Color.h b/src/basics/Color.h index 5dd8aaa..074fdda 100644 --- a/src/basics/Color.h +++ b/src/basics/Color.h @@ -6,7 +6,7 @@ namespace paysages { namespace basics { -class Color +class BASICSSHARED_EXPORT Color { public: Color(); diff --git a/src/basics/Geometry.h b/src/basics/Geometry.h index ff3bd19..6a75f85 100644 --- a/src/basics/Geometry.h +++ b/src/basics/Geometry.h @@ -6,7 +6,7 @@ namespace paysages { namespace basics { -class Geometry +class BASICSSHARED_EXPORT Geometry { public: static double get2DAngle(double x, double y); diff --git a/src/basics/Matrix4.cpp b/src/basics/Matrix4.cpp index 7c65b05..b32fc05 100644 --- a/src/basics/Matrix4.cpp +++ b/src/basics/Matrix4.cpp @@ -2,6 +2,7 @@ #include #include "PackStream.h" +#include "Vector3.h" Matrix4::Matrix4(bool identity) { diff --git a/src/basics/Matrix4.h b/src/basics/Matrix4.h index 42954c7..03c454f 100644 --- a/src/basics/Matrix4.h +++ b/src/basics/Matrix4.h @@ -3,7 +3,6 @@ #include "basics_global.h" -#include "Vector3.h" #ifdef QT_GUI_LIB #include #endif diff --git a/src/basics/SpaceSegment.h b/src/basics/SpaceSegment.h index d7220ef..4abfe86 100644 --- a/src/basics/SpaceSegment.h +++ b/src/basics/SpaceSegment.h @@ -5,15 +5,13 @@ #include "Vector3.h" -namespace paysages -{ -namespace basics -{ +namespace paysages { +namespace basics { /*! * \brief A segment in 3D space (mainly useful for rays). */ -class SpaceSegment +class BASICSSHARED_EXPORT SpaceSegment { public: SpaceSegment(const Vector3& start, const Vector3& end); diff --git a/src/basics/Texture2D.h b/src/basics/Texture2D.h index 67d1649..1e762bb 100644 --- a/src/basics/Texture2D.h +++ b/src/basics/Texture2D.h @@ -6,7 +6,7 @@ namespace paysages { namespace basics { -class Texture2D +class BASICSSHARED_EXPORT Texture2D { public: Texture2D(int xsize, int ysize); diff --git a/src/basics/Texture3D.h b/src/basics/Texture3D.h index 8a68208..b73301c 100644 --- a/src/basics/Texture3D.h +++ b/src/basics/Texture3D.h @@ -6,7 +6,7 @@ namespace paysages { namespace basics { -class Texture3D +class BASICSSHARED_EXPORT Texture3D { public: Texture3D(int xsize, int ysize, int zsize); diff --git a/src/basics/Texture4D.h b/src/basics/Texture4D.h index 6b53580..18a863f 100644 --- a/src/basics/Texture4D.h +++ b/src/basics/Texture4D.h @@ -6,7 +6,7 @@ namespace paysages { namespace basics { -class Texture4D +class BASICSSHARED_EXPORT Texture4D { public: Texture4D(int xsize, int ysize, int zsize, int wsize); diff --git a/src/basics/basics_global.h b/src/basics/basics_global.h index 4ea3e7c..591f672 100644 --- a/src/basics/basics_global.h +++ b/src/basics/basics_global.h @@ -29,4 +29,14 @@ namespace 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 diff --git a/src/definition/AtmosphereDefinition.h b/src/definition/AtmosphereDefinition.h index 39d4838..0067ecf 100644 --- a/src/definition/AtmosphereDefinition.h +++ b/src/definition/AtmosphereDefinition.h @@ -11,7 +11,7 @@ namespace paysages { namespace definition { -class AtmosphereDefinition : public BaseDefinition +class DEFINITIONSHARED_EXPORT AtmosphereDefinition : public BaseDefinition { public: typedef struct diff --git a/src/definition/CameraDefinition.h b/src/definition/CameraDefinition.h index e8b3364..faab350 100644 --- a/src/definition/CameraDefinition.h +++ b/src/definition/CameraDefinition.h @@ -19,7 +19,7 @@ typedef struct double zfar; } CameraPerspective; -class BASICSSHARED_EXPORT CameraDefinition: public BaseDefinition +class DEFINITIONSHARED_EXPORT CameraDefinition: public BaseDefinition { public: CameraDefinition(); diff --git a/src/definition/WaterDefinition.h b/src/definition/WaterDefinition.h index 929984c..0cd5a24 100644 --- a/src/definition/WaterDefinition.h +++ b/src/definition/WaterDefinition.h @@ -8,7 +8,7 @@ namespace paysages { namespace definition { -class WaterDefinition: public BaseDefinition +class DEFINITIONSHARED_EXPORT WaterDefinition: public BaseDefinition { public: WaterDefinition(BaseDefinition* parent); diff --git a/src/render/preview/AtmosphereColorPreviewRenderer.h b/src/render/preview/AtmosphereColorPreviewRenderer.h index 455e888..fceb391 100644 --- a/src/render/preview/AtmosphereColorPreviewRenderer.h +++ b/src/render/preview/AtmosphereColorPreviewRenderer.h @@ -6,7 +6,7 @@ namespace paysages { namespace preview { -class AtmosphereColorPreviewRenderer:public Base2dPreviewRenderer +class PREVIEWSHARED_EXPORT AtmosphereColorPreviewRenderer:public Base2dPreviewRenderer { public: AtmosphereColorPreviewRenderer(AtmosphereDefinition* definition, double heading); diff --git a/src/render/preview/BasePreview.h b/src/render/preview/BasePreview.h index 6d1e3e0..d182ed7 100644 --- a/src/render/preview/BasePreview.h +++ b/src/render/preview/BasePreview.h @@ -28,7 +28,7 @@ public: bool value; }; -class BasePreview : public DrawingWidget +class PREVIEWSHARED_EXPORT BasePreview : public DrawingWidget { Q_OBJECT diff --git a/src/render/preview/DrawingWidget.h b/src/render/preview/DrawingWidget.h index fd733cf..fbe6d61 100644 --- a/src/render/preview/DrawingWidget.h +++ b/src/render/preview/DrawingWidget.h @@ -11,7 +11,7 @@ class QPainter; namespace paysages { namespace preview { -class DrawingWidget : public QWidget +class PREVIEWSHARED_EXPORT DrawingWidget : public QWidget { Q_OBJECT public: diff --git a/src/render/preview/PreviewOsd.h b/src/render/preview/PreviewOsd.h index 9771429..c92f701 100644 --- a/src/render/preview/PreviewOsd.h +++ b/src/render/preview/PreviewOsd.h @@ -9,7 +9,7 @@ class QImage; namespace paysages { namespace preview { -class PreviewOsd +class PREVIEWSHARED_EXPORT PreviewOsd { public: PreviewOsd(); diff --git a/src/render/preview/PreviewOsdItem.h b/src/render/preview/PreviewOsdItem.h index b9b2c4c..8ab29ae 100644 --- a/src/render/preview/PreviewOsdItem.h +++ b/src/render/preview/PreviewOsdItem.h @@ -8,7 +8,7 @@ namespace paysages { namespace preview { -class PreviewOsdItem:public QImage +class PREVIEWSHARED_EXPORT PreviewOsdItem:public QImage { public: PreviewOsdItem(int width, int height); diff --git a/src/render/preview/TerrainShapePreviewRenderer.h b/src/render/preview/TerrainShapePreviewRenderer.h index 21ea419..1f4d574 100644 --- a/src/render/preview/TerrainShapePreviewRenderer.h +++ b/src/render/preview/TerrainShapePreviewRenderer.h @@ -8,7 +8,7 @@ namespace paysages { namespace preview { -class TerrainShapePreviewRenderer : public Base2dPreviewRenderer +class PREVIEWSHARED_EXPORT TerrainShapePreviewRenderer : public Base2dPreviewRenderer { public: explicit TerrainShapePreviewRenderer(TerrainDefinition* terrain); diff --git a/src/render/software/clouds/BaseCloudsModel.h b/src/render/software/clouds/BaseCloudsModel.h index 594ae04..09fa815 100644 --- a/src/render/software/clouds/BaseCloudsModel.h +++ b/src/render/software/clouds/BaseCloudsModel.h @@ -11,7 +11,7 @@ namespace software { /*! * \brief Abstract class for all cloud models (cirrus, cumulus...). */ -class BaseCloudsModel +class SOFTWARESHARED_EXPORT BaseCloudsModel { public: BaseCloudsModel(CloudLayerDefinition *layer); diff --git a/src/system/ParallelPool.h b/src/system/ParallelPool.h index 350d41e..d36832e 100644 --- a/src/system/ParallelPool.h +++ b/src/system/ParallelPool.h @@ -9,7 +9,7 @@ namespace system { /*! * Pool to handle a group of threads doing the same task. */ -class ParallelPool +class SYSTEMSHARED_EXPORT ParallelPool { public: ParallelPool(); diff --git a/src/system/system_global.h b/src/system/system_global.h index b557937..52e9755 100644 --- a/src/system/system_global.h +++ b/src/system/system_global.h @@ -1,7 +1,9 @@ #ifndef SYSTEM_GLOBAL_H #define SYSTEM_GLOBAL_H +#ifndef __MINGW32__ #define PAYSAGES_USE_INLINING 1 +#endif #include #if defined(SYSTEM_LIBRARY)