lauchmelder/SFML
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Each module now has its own export macro, which solves the "unresolved symbol" error with sf::Time::Zero

Browse source
This commit is contained in:
Laurent Gomila 2012-01-21 10:34:17 +01:00
parent bb7cf47d69
commit 906a62df0f
69 changed files with 450 additions and 180 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/SFML/Graphics/CircleShape.hpp
View file

@ -28,6 +28,7 @@
////////////////////////////////////////////////////////////
// Headers
////////////////////////////////////////////////////////////
#include <SFML/Graphics/Export.hpp>
#include <SFML/Graphics/Shape.hpp>
@ -37,7 +38,7 @@ namespace sf
/// \brief Specialized shape representing a circle
///
////////////////////////////////////////////////////////////
class SFML_API CircleShape : public Shape
class SFML_GRAPHICS_API CircleShape : public Shape
{
public :

16
include/SFML/Graphics/Color.hpp
View file

@ -28,7 +28,7 @@
////////////////////////////////////////////////////////////
// Headers
////////////////////////////////////////////////////////////
#include <SFML/Config.hpp>
#include <SFML/Graphics/Export.hpp>
namespace sf
@ -37,7 +37,7 @@ namespace sf
/// \brief Utility class for manpulating RGBA colors
///
////////////////////////////////////////////////////////////
class SFML_API Color
class SFML_GRAPHICS_API Color
{
public :
@ -95,7 +95,7 @@ public :
/// \return True if colors are equal, false if they are different
///
////////////////////////////////////////////////////////////
SFML_API bool operator ==(const Color& left, const Color& right);
SFML_GRAPHICS_API bool operator ==(const Color& left, const Color& right);
////////////////////////////////////////////////////////////
/// \relates Color
@ -109,7 +109,7 @@ SFML_API bool operator ==(const Color& left, const Color& right);
/// \return True if colors are different, false if they are equal
///
////////////////////////////////////////////////////////////
SFML_API bool operator !=(const Color& left, const Color& right);
SFML_GRAPHICS_API bool operator !=(const Color& left, const Color& right);
////////////////////////////////////////////////////////////
/// \relates Color
@ -124,7 +124,7 @@ SFML_API bool operator !=(const Color& left, const Color& right);
/// \return Result of \a left + \a right
///
////////////////////////////////////////////////////////////
SFML_API Color operator +(const Color& left, const Color& right);
SFML_GRAPHICS_API Color operator +(const Color& left, const Color& right);
////////////////////////////////////////////////////////////
/// \relates Color
@ -141,7 +141,7 @@ SFML_API Color operator +(const Color& left, const Color& right);
/// \return Result of \a left * \a right
///
////////////////////////////////////////////////////////////
SFML_API Color operator *(const Color& left, const Color& right);
SFML_GRAPHICS_API Color operator *(const Color& left, const Color& right);
////////////////////////////////////////////////////////////
/// \relates Color
@ -157,7 +157,7 @@ SFML_API Color operator *(const Color& left, const Color& right);
/// \return Reference to \a left
///
////////////////////////////////////////////////////////////
SFML_API Color& operator +=(Color& left, const Color& right);
SFML_GRAPHICS_API Color& operator +=(Color& left, const Color& right);
////////////////////////////////////////////////////////////
/// \relates Color
@ -175,7 +175,7 @@ SFML_API Color& operator +=(Color& left, const Color& right);
/// \return Reference to \a left
///
////////////////////////////////////////////////////////////
SFML_API Color& operator *=(Color& left, const Color& right);
SFML_GRAPHICS_API Color& operator *=(Color& left, const Color& right);
} // namespace sf

3
include/SFML/Graphics/ConvexShape.hpp
View file

@ -28,6 +28,7 @@
////////////////////////////////////////////////////////////
// Headers
////////////////////////////////////////////////////////////
#include <SFML/Graphics/Export.hpp>
#include <SFML/Graphics/Shape.hpp>
#include <vector>
@ -38,7 +39,7 @@ namespace sf
/// \brief Specialized shape representing a convex polygon
///
////////////////////////////////////////////////////////////
class SFML_API ConvexShape : public Shape
class SFML_GRAPHICS_API ConvexShape : public Shape
{
public :

4
include/SFML/Graphics/Drawable.hpp
View file

@ -28,7 +28,7 @@
////////////////////////////////////////////////////////////
// Headers
////////////////////////////////////////////////////////////
#include <SFML/Config.hpp>
#include <SFML/Graphics/Export.hpp>
#include <SFML/Graphics/RenderStates.hpp>
@ -41,7 +41,7 @@ class RenderTarget;
/// to a render target
///
////////////////////////////////////////////////////////////
class SFML_API Drawable
class SFML_GRAPHICS_API Drawable
{
public :

48
include/SFML/Graphics/Export.hpp Normal file
View file

@ -0,0 +1,48 @@
////////////////////////////////////////////////////////////
//
// SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
//
// This software is provided 'as-is', without any express or implied warranty.
// In no event will the authors be held liable for any damages arising from the use of this software.
//
// Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it freely,
// subject to the following restrictions:
//
// 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software.
// If you use this software in a product, an acknowledgment
// in the product documentation would be appreciated but is not required.
//
// 2. Altered source versions must be plainly marked as such,
// and must not be misrepresented as being the original software.
//
// 3. This notice may not be removed or altered from any source distribution.
//
////////////////////////////////////////////////////////////
#ifndef SFML_GRAPHICS_EXPORT_HPP
#define SFML_GRAPHICS_EXPORT_HPP
////////////////////////////////////////////////////////////
// Headers
////////////////////////////////////////////////////////////
#include <SFML/Config.hpp>
////////////////////////////////////////////////////////////
// Define portable import / export macros
////////////////////////////////////////////////////////////
#if defined(SFML_GRAPHICS_EXPORTS)
#define SFML_GRAPHICS_API SFML_API_EXPORT
#else
#define SFML_GRAPHICS_API SFML_API_IMPORT
#endif
#endif // SFML_GRAPHICS_EXPORT_HPP

7
include/SFML/Graphics/Font.hpp
View file

@ -28,11 +28,12 @@
////////////////////////////////////////////////////////////
// Headers
////////////////////////////////////////////////////////////
#include <SFML/System/Vector2.hpp>
#include <SFML/System/String.hpp>
#include <SFML/Graphics/Export.hpp>
#include <SFML/Graphics/Glyph.hpp>
#include <SFML/Graphics/Texture.hpp>
#include <SFML/Graphics/Rect.hpp>
#include <SFML/System/Vector2.hpp>
#include <SFML/System/String.hpp>
#include <map>
#include <string>
#include <vector>
@ -46,7 +47,7 @@ class InputStream;
/// \brief Class for loading and manipulating character fonts
///
////////////////////////////////////////////////////////////
class SFML_API Font
class SFML_GRAPHICS_API Font
{
public :

4
include/SFML/Graphics/Glyph.hpp
View file

@ -28,7 +28,7 @@
////////////////////////////////////////////////////////////
// Headers
////////////////////////////////////////////////////////////
#include <SFML/Config.hpp>
#include <SFML/Graphics/Export.hpp>
#include <SFML/Graphics/Rect.hpp>
@ -38,7 +38,7 @@ namespace sf
/// \brief Structure describing a glyph
///
////////////////////////////////////////////////////////////
class SFML_API Glyph
class SFML_GRAPHICS_API Glyph
{
public :

3
include/SFML/Graphics/Image.hpp
View file

@ -28,6 +28,7 @@
////////////////////////////////////////////////////////////
// Headers
////////////////////////////////////////////////////////////
#include <SFML/Graphics/Export.hpp>
#include <SFML/Graphics/Color.hpp>
#include <SFML/Graphics/Rect.hpp>
#include <string>
@ -42,7 +43,7 @@ class InputStream;
/// \brief Class for loading, manipulating and saving images
///
////////////////////////////////////////////////////////////
class SFML_API Image
class SFML_GRAPHICS_API Image
{
public :

3
include/SFML/Graphics/RectangleShape.hpp
View file

@ -28,6 +28,7 @@
////////////////////////////////////////////////////////////
// Headers
////////////////////////////////////////////////////////////
#include <SFML/Graphics/Export.hpp>
#include <SFML/Graphics/Shape.hpp>
@ -37,7 +38,7 @@ namespace sf
/// \brief Specialized shape representing a rectangle
///
////////////////////////////////////////////////////////////
class SFML_API RectangleShape : public Shape
class SFML_GRAPHICS_API RectangleShape : public Shape
{
public :

3
include/SFML/Graphics/RenderStates.hpp
View file

@ -28,6 +28,7 @@
////////////////////////////////////////////////////////////
// Headers
////////////////////////////////////////////////////////////
#include <SFML/Graphics/Export.hpp>
#include <SFML/Graphics/BlendMode.hpp>
#include <SFML/Graphics/Transform.hpp>
@ -41,7 +42,7 @@ class Texture;
/// \brief Define the states used for drawing to a RenderTarget
///
////////////////////////////////////////////////////////////
class SFML_API RenderStates
class SFML_GRAPHICS_API RenderStates
{
public :

5
include/SFML/Graphics/RenderTarget.hpp
View file

@ -28,7 +28,7 @@
////////////////////////////////////////////////////////////
// Headers
////////////////////////////////////////////////////////////
#include <SFML/System/NonCopyable.hpp>
#include <SFML/Graphics/Export.hpp>
#include <SFML/Graphics/Color.hpp>
#include <SFML/Graphics/Rect.hpp>
#include <SFML/Graphics/View.hpp>
@ -37,6 +37,7 @@
#include <SFML/Graphics/RenderStates.hpp>
#include <SFML/Graphics/PrimitiveType.hpp>
#include <SFML/Graphics/Vertex.hpp>
#include <SFML/System/NonCopyable.hpp>
namespace sf
@ -47,7 +48,7 @@ class Drawable;
/// \brief Base class for all render targets (window, texture, ...)
///
////////////////////////////////////////////////////////////
class SFML_API RenderTarget : NonCopyable
class SFML_GRAPHICS_API RenderTarget : NonCopyable
{
public :

3
include/SFML/Graphics/RenderTexture.hpp
View file

@ -28,6 +28,7 @@
////////////////////////////////////////////////////////////
// Headers
////////////////////////////////////////////////////////////
#include <SFML/Graphics/Export.hpp>
#include <SFML/Graphics/Texture.hpp>
#include <SFML/Graphics/RenderTarget.hpp>
@ -43,7 +44,7 @@ namespace priv
/// \brief Target for off-screen 2D rendering into an texture
///
////////////////////////////////////////////////////////////
class SFML_API RenderTexture : public RenderTarget
class SFML_GRAPHICS_API RenderTexture : public RenderTarget
{
public :

3
include/SFML/Graphics/RenderWindow.hpp
View file

@ -28,6 +28,7 @@
////////////////////////////////////////////////////////////
// Headers
////////////////////////////////////////////////////////////
#include <SFML/Graphics/Export.hpp>
#include <SFML/Graphics/RenderTarget.hpp>
#include <SFML/Graphics/Image.hpp>
#include <SFML/Window/Window.hpp>
@ -40,7 +41,7 @@ namespace sf
/// \brief Window that can serve as a target for 2D drawing
///
////////////////////////////////////////////////////////////
class SFML_API RenderWindow : public Window, public RenderTarget
class SFML_GRAPHICS_API RenderWindow : public Window, public RenderTarget
{
public :

4
include/SFML/Graphics/Shader.hpp
View file

@ -28,7 +28,7 @@
////////////////////////////////////////////////////////////
// Headers
////////////////////////////////////////////////////////////
#include <SFML/Config.hpp>
#include <SFML/Graphics/Export.hpp>
#include <SFML/Graphics/Transform.hpp>
#include <SFML/Graphics/Color.hpp>
#include <SFML/Window/GlResource.hpp>
@ -48,7 +48,7 @@ class Texture;
/// \brief Shader class (vertex and fragment)
///
////////////////////////////////////////////////////////////
class SFML_API Shader : GlResource, NonCopyable
class SFML_GRAPHICS_API Shader : GlResource, NonCopyable
{
public :

3
include/SFML/Graphics/Shape.hpp
View file

@ -28,6 +28,7 @@
////////////////////////////////////////////////////////////
// Headers
////////////////////////////////////////////////////////////
#include <SFML/Graphics/Export.hpp>
#include <SFML/Graphics/Drawable.hpp>
#include <SFML/Graphics/Transformable.hpp>
#include <SFML/Graphics/VertexArray.hpp>
@ -40,7 +41,7 @@ namespace sf
/// \brief Base class for textured shapes with outline
///
////////////////////////////////////////////////////////////
class SFML_API Shape : public Drawable, public Transformable
class SFML_GRAPHICS_API Shape : public Drawable, public Transformable
{
public :

3
include/SFML/Graphics/Sprite.hpp
View file

@ -28,6 +28,7 @@
////////////////////////////////////////////////////////////
// Headers
////////////////////////////////////////////////////////////
#include <SFML/Graphics/Export.hpp>
#include <SFML/Graphics/Drawable.hpp>
#include <SFML/Graphics/Transformable.hpp>
#include <SFML/Graphics/Vertex.hpp>
@ -43,7 +44,7 @@ class Texture;
/// own transformations, color, etc.
///
////////////////////////////////////////////////////////////
class SFML_API Sprite : public Drawable, public Transformable
class SFML_GRAPHICS_API Sprite : public Drawable, public Transformable
{
public :

5
include/SFML/Graphics/Text.hpp
View file

@ -28,12 +28,13 @@
////////////////////////////////////////////////////////////
// Headers
////////////////////////////////////////////////////////////
#include <SFML/System/String.hpp>
#include <SFML/Graphics/Export.hpp>
#include <SFML/Graphics/Drawable.hpp>
#include <SFML/Graphics/Transformable.hpp>
#include <SFML/Graphics/Font.hpp>
#include <SFML/Graphics/Rect.hpp>
#include <SFML/Graphics/VertexArray.hpp>
#include <SFML/System/String.hpp>
#include <string>
#include <vector>
@ -44,7 +45,7 @@ namespace sf
/// \brief Graphical text that can be drawn to a render target
///
////////////////////////////////////////////////////////////
class SFML_API Text : public Drawable, public Transformable
class SFML_GRAPHICS_API Text : public Drawable, public Transformable
{
public :

3
include/SFML/Graphics/Texture.hpp
View file

@ -28,6 +28,7 @@
////////////////////////////////////////////////////////////
// Headers
////////////////////////////////////////////////////////////
#include <SFML/Graphics/Export.hpp>
#include <SFML/Graphics/Image.hpp>
#include <SFML/Window/GlResource.hpp>
@ -43,7 +44,7 @@ class InputStream;
/// \brief Image living on the graphics card that can be used for drawing
///
////////////////////////////////////////////////////////////
class SFML_API Texture : GlResource
class SFML_GRAPHICS_API Texture : GlResource
{
public :

10
include/SFML/Graphics/Transform.hpp
View file

@ -28,7 +28,7 @@
////////////////////////////////////////////////////////////
// Headers
////////////////////////////////////////////////////////////
#include <SFML/Config.hpp>
#include <SFML/Graphics/Export.hpp>
#include <SFML/Graphics/Rect.hpp>
#include <SFML/System/Vector2.hpp>
@ -39,7 +39,7 @@ namespace sf
/// \brief Define a 3x3 transform matrix
///
////////////////////////////////////////////////////////////
class SFML_API Transform
class SFML_GRAPHICS_API Transform
{
public :
@ -373,7 +373,7 @@ private:
/// \return New combined transform
///
////////////////////////////////////////////////////////////
SFML_API Transform operator *(const Transform& left, const Transform& right);
SFML_GRAPHICS_API Transform operator *(const Transform& left, const Transform& right);
////////////////////////////////////////////////////////////
/// \relates sf::Transform
@ -387,7 +387,7 @@ SFML_API Transform operator *(const Transform& left, const Transform& right);
/// \return The combined transform
///
////////////////////////////////////////////////////////////
SFML_API Transform& operator *=(Transform& left, const Transform& right);
SFML_GRAPHICS_API Transform& operator *=(Transform& left, const Transform& right);
////////////////////////////////////////////////////////////
/// \relates sf::Transform
@ -401,7 +401,7 @@ SFML_API Transform& operator *=(Transform& left, const Transform& right);
/// \return New transformed point
///
////////////////////////////////////////////////////////////
SFML_API Vector2f operator *(const Transform& left, const Vector2f& right);
SFML_GRAPHICS_API Vector2f operator *(const Transform& left, const Vector2f& right);
} // namespace sf

3
include/SFML/Graphics/Transformable.hpp
View file

@ -28,6 +28,7 @@
////////////////////////////////////////////////////////////
// Headers
////////////////////////////////////////////////////////////
#include <SFML/Graphics/Export.hpp>
#include <SFML/Graphics/Transform.hpp>
@ -37,7 +38,7 @@ namespace sf
/// \brief Decomposed transform defined by a position, a rotation and a scale
///
////////////////////////////////////////////////////////////
class SFML_API Transformable
class SFML_GRAPHICS_API Transformable
{
public :

5
include/SFML/Graphics/Vertex.hpp
View file

@ -28,8 +28,9 @@
////////////////////////////////////////////////////////////
// Headers
////////////////////////////////////////////////////////////
#include <SFML/System/Vector2.hpp>
#include <SFML/Graphics/Export.hpp>
#include <SFML/Graphics/Color.hpp>
#include <SFML/System/Vector2.hpp>
namespace sf
@ -38,7 +39,7 @@ namespace sf
/// \brief Define a point with color and texture coordinates
///
////////////////////////////////////////////////////////////
class SFML_API Vertex
class SFML_GRAPHICS_API Vertex
{
public :

3
include/SFML/Graphics/VertexArray.hpp
View file

@ -28,6 +28,7 @@
////////////////////////////////////////////////////////////
// Headers
////////////////////////////////////////////////////////////
#include <SFML/Graphics/Export.hpp>
#include <SFML/Graphics/Vertex.hpp>
#include <SFML/Graphics/PrimitiveType.hpp>
#include <SFML/Graphics/Rect.hpp>
@ -41,7 +42,7 @@ namespace sf
/// \brief Define a set of one or more 2D primitives
///
////////////////////////////////////////////////////////////
class SFML_API VertexArray : public Drawable
class SFML_GRAPHICS_API VertexArray : public Drawable
{
public :

4
include/SFML/Graphics/View.hpp
View file

@ -28,7 +28,7 @@
////////////////////////////////////////////////////////////
// Headers
////////////////////////////////////////////////////////////
#include <SFML/Config.hpp>
#include <SFML/Graphics/Export.hpp>
#include <SFML/Graphics/Rect.hpp>
#include <SFML/Graphics/Transform.hpp>
#include <SFML/System/Vector2.hpp>
@ -40,7 +40,7 @@ namespace sf
/// \brief 2D camera that defines what region is shown on screen
///
////////////////////////////////////////////////////////////
class SFML_API View
class SFML_GRAPHICS_API View
{
public :