Each module now has its own export macro

src/SFML/Audio/CMakeLists.txt

@@ -4,6 +4,7 @@ set(SRCROOT ${CMAKE_SOURCE_DIR}/src/SFML/Audio)
 
 # all source files
 set(SRC
+    ${INCROOT}/Export.h
     ${SRCROOT}/Listener.cpp
     ${INCROOT}/Listener.h
     ${SRCROOT}/Music.cpp

src/SFML/Audio/Music.cpp

@@ -99,10 +99,11 @@ sfBool sfMusic_GetLoop(const sfMusic* music)
 ////////////////////////////////////////////////////////////
 sfTime sfMusic_GetDuration(const sfMusic* music)
 {
-    CSFML_CHECK_RETURN(music, sfTimeZero);
+    sfTime time = {0};
+    CSFML_CHECK_RETURN(music, time);
 
-    sf::Time time = music->This.GetDuration();
-    return sfMicroseconds(time.AsMicroseconds());
+    time.Microseconds = music->This.GetDuration().AsMicroseconds();
+    return time;
 }
 
 
@@ -153,10 +154,11 @@ sfSoundStatus sfMusic_GetStatus(const sfMusic* music)
 ////////////////////////////////////////////////////////////
 sfTime sfMusic_GetPlayingOffset(const sfMusic* music)
 {
-    CSFML_CHECK_RETURN(music, sfTimeZero);
+    sfTime time = {0};
+    CSFML_CHECK_RETURN(music, time);
 
-    sf::Time time = music->This.GetPlayingOffset();
-    return sfMicroseconds(time.AsMicroseconds());
+    time.Microseconds = music->This.GetPlayingOffset().AsMicroseconds();
+    return time;
 }
 
 
@@ -239,7 +241,7 @@ void sfMusic_GetPosition(const sfMusic* music, float* x, float* y, float* z)
 
 
 ////////////////////////////////////////////////////////////
-CSFML_API sfBool sfMusic_IsRelativeToListener(const sfMusic* music)
+CSFML_AUDIO_API sfBool sfMusic_IsRelativeToListener(const sfMusic* music)
 {
     CSFML_CALL_RETURN(music, IsRelativeToListener(), sfFalse);
 }

src/SFML/Audio/Sound.cpp

@@ -193,7 +193,7 @@ void sfSound_GetPosition(const sfSound* sound, float* x, float* y, float* z)
 
 
 ////////////////////////////////////////////////////////////
-CSFML_API sfBool sfSound_IsRelativeToListener(const sfSound* sound)
+CSFML_AUDIO_API sfBool sfSound_IsRelativeToListener(const sfSound* sound)
 {
     CSFML_CALL_RETURN(sound, IsRelativeToListener(), sfFalse);
 }
@@ -216,8 +216,9 @@ float sfSound_GetAttenuation(const sfSound* sound)
 ////////////////////////////////////////////////////////////
 sfTime sfSound_GetPlayingOffset(const sfSound* sound)
 {
-    CSFML_CHECK_RETURN(sound, sfTimeZero)
+    sfTime time = {0};
+    CSFML_CHECK_RETURN(sound, time);
 
-    sf::Time time = sound->This.GetPlayingOffset();
-    return sfMicroseconds(time.AsMicroseconds());
+    time.Microseconds = sound->This.GetPlayingOffset().AsMicroseconds();
+    return time;
 }

src/SFML/Audio/SoundBuffer.cpp

@@ -63,7 +63,7 @@ sfSoundBuffer* sfSoundBuffer_CreateFromMemory(const void* data, size_t sizeInByt
 
 
 ////////////////////////////////////////////////////////////
-CSFML_API sfSoundBuffer* sfSoundBuffer_CreateFromStream(sfInputStream* stream)
+CSFML_AUDIO_API sfSoundBuffer* sfSoundBuffer_CreateFromStream(sfInputStream* stream)
 {
     CSFML_CHECK_RETURN(stream, NULL);
 
@@ -148,8 +148,9 @@ unsigned int sfSoundBuffer_GetChannelCount(const sfSoundBuffer* soundBuffer)
 ////////////////////////////////////////////////////////////
 sfTime sfSoundBuffer_GetDuration(const sfSoundBuffer* soundBuffer)
 {
-    CSFML_CHECK_RETURN(soundBuffer, sfTimeZero)
+    sfTime time = {0};
+    CSFML_CHECK_RETURN(soundBuffer, time);
 
-    sf::Time duration = soundBuffer->This.GetDuration();
-    return sfMicroseconds(duration.AsMicroseconds());
+    time.Microseconds = soundBuffer->This.GetDuration().AsMicroseconds();
+    return time;
 }

src/SFML/Audio/SoundStream.cpp

@@ -175,7 +175,7 @@ void sfSoundStream_GetPosition(const sfSoundStream* soundStream, float* x, float
 
 
 ////////////////////////////////////////////////////////////
-CSFML_API sfBool sfSoundStream_IsRelativeToListener(const sfSoundStream* soundStream)
+CSFML_AUDIO_API sfBool sfSoundStream_IsRelativeToListener(const sfSoundStream* soundStream)
 {
     CSFML_CALL_RETURN(soundStream, IsRelativeToListener(), sfFalse);
 }
@@ -205,8 +205,9 @@ sfBool sfSoundStream_GetLoop(const sfSoundStream* soundStream)
 ////////////////////////////////////////////////////////////
 sfTime sfSoundStream_GetPlayingOffset(const sfSoundStream* soundStream)
 {
-    CSFML_CHECK_RETURN(soundStream, sfTimeZero);
+    sfTime time = {0};
+    CSFML_CHECK_RETURN(soundStream, time);
 
-    sf::Time offset = soundStream->This.GetPlayingOffset();
-    return sfMicroseconds(offset.AsMicroseconds());
+    time.Microseconds = soundStream->This.GetPlayingOffset().AsMicroseconds();
+    return time;
 }

src/SFML/Audio/SoundStreamStruct.h

@@ -67,7 +67,10 @@ private :
     virtual void OnSeek(sf::Time timeOffset)
     {
         if (mySeekCallback)
-            mySeekCallback(sfMicroseconds(timeOffset.AsMicroseconds()), myUserData);
+        {
+            sfTime time = {timeOffset.AsMicroseconds()};
+            mySeekCallback(time, myUserData);
+        }
     }
 
     sfSoundStreamGetDataCallback myGetDataCallback;

src/SFML/Graphics/CMakeLists.txt

@@ -4,6 +4,7 @@ set(SRCROOT ${CMAKE_SOURCE_DIR}/src/SFML/Graphics)
 
 # all source files
 set(SRC
+    ${INCROOT}/Export.h
     ${INCROOT}/BlendMode.h
     ${SRCROOT}/CircleShape.cpp
     ${SRCROOT}/CircleShapeStruct.h

src/SFML/Graphics/RenderTexture.cpp

@@ -189,7 +189,7 @@ void sfRenderTexture_DrawVertexArray(sfRenderTexture* renderTexture, const sfVer
 
 
 ////////////////////////////////////////////////////////////
-CSFML_API void sfRenderTexture_DrawPrimitives(sfRenderTexture* renderTexture,
+CSFML_GRAPHICS_API void sfRenderTexture_DrawPrimitives(sfRenderTexture* renderTexture,
                                               const sfVertex* vertices, unsigned int vertexCount,
                                               sfPrimitiveType type, const sfRenderStates* states)
 {
@@ -199,21 +199,21 @@ CSFML_API void sfRenderTexture_DrawPrimitives(sfRenderTexture* renderTexture,
 
 
 ////////////////////////////////////////////////////////////
-CSFML_API void sfRenderTexture_PushGLStates(sfRenderTexture* renderTexture)
+CSFML_GRAPHICS_API void sfRenderTexture_PushGLStates(sfRenderTexture* renderTexture)
 {
     CSFML_CALL(renderTexture, PushGLStates());
 }
 
 
 ////////////////////////////////////////////////////////////
-CSFML_API void sfRenderTexture_PopGLStates(sfRenderTexture* renderTexture)
+CSFML_GRAPHICS_API void sfRenderTexture_PopGLStates(sfRenderTexture* renderTexture)
 {
     CSFML_CALL(renderTexture, PopGLStates());
 }
 
 
 ////////////////////////////////////////////////////////////
-CSFML_API void sfRenderTexture_ResetGLStates(sfRenderTexture* renderTexture)
+CSFML_GRAPHICS_API void sfRenderTexture_ResetGLStates(sfRenderTexture* renderTexture)
 {
     CSFML_CALL(renderTexture, ResetGLStates());
 }

src/SFML/Graphics/RenderWindow.cpp

@@ -378,7 +378,7 @@ void sfRenderWindow_DrawVertexArray(sfRenderWindow* renderWindow, const sfVertex
 
 
 ////////////////////////////////////////////////////////////
-CSFML_API void sfRenderWindow_DrawPrimitives(sfRenderWindow* renderWindow,
+CSFML_GRAPHICS_API void sfRenderWindow_DrawPrimitives(sfRenderWindow* renderWindow,
                                              const sfVertex* vertices, unsigned int vertexCount,
                                              sfPrimitiveType type, const sfRenderStates* states)
 {
@@ -388,21 +388,21 @@ CSFML_API void sfRenderWindow_DrawPrimitives(sfRenderWindow* renderWindow,
 
 
 ////////////////////////////////////////////////////////////
-CSFML_API void sfRenderWindow_PushGLStates(sfRenderWindow* renderWindow)
+CSFML_GRAPHICS_API void sfRenderWindow_PushGLStates(sfRenderWindow* renderWindow)
 {
     CSFML_CALL(renderWindow, PushGLStates());
 }
 
 
 ////////////////////////////////////////////////////////////
-CSFML_API void sfRenderWindow_PopGLStates(sfRenderWindow* renderWindow)
+CSFML_GRAPHICS_API void sfRenderWindow_PopGLStates(sfRenderWindow* renderWindow)
 {
     CSFML_CALL(renderWindow, PopGLStates());
 }
 
 
 ////////////////////////////////////////////////////////////
-CSFML_API void sfRenderWindow_ResetGLStates(sfRenderWindow* renderWindow)
+CSFML_GRAPHICS_API void sfRenderWindow_ResetGLStates(sfRenderWindow* renderWindow)
 {
     CSFML_CALL(renderWindow, ResetGLStates());
 }

src/SFML/Network/CMakeLists.txt

@@ -4,6 +4,7 @@ set(SRCROOT ${CMAKE_SOURCE_DIR}/src/SFML/Network)
 
 # all source files
 set(SRC
+    ${INCROOT}/Export.h
     ${SRCROOT}/Ftp.cpp
     ${SRCROOT}/FtpStruct.h
     ${INCROOT}/Ftp.h

src/SFML/System/CMakeLists.txt

@@ -4,6 +4,7 @@ set(SRCROOT ${CMAKE_SOURCE_DIR}/src/SFML/System)
 
 # all source files
 set(SRC
+    ${INCROOT}/Export.h
     ${SRCROOT}/Clock.cpp
     ${SRCROOT}/ClockStruct.h
     ${INCROOT}/Clock.h

src/SFML/Window/CMakeLists.txt

@@ -4,6 +4,7 @@ set(SRCROOT ${CMAKE_SOURCE_DIR}/src/SFML/Window)
 
 # all source files
 set(SRC
+    ${INCROOT}/Export.h
     ${SRCROOT}/Context.cpp
     ${SRCROOT}/ContextStruct.h
     ${INCROOT}/Context.h