diff --git a/.appveyor.yml b/.appveyor.yml index 806ed518..9d0e616e 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -23,7 +23,7 @@ environment: - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 SFML_ROOT: C:\SFML-VS2013 - SFML_VERSION: 2.4.0 + SFML_VERSION: 2.3 GENERATOR: Visual Studio 12 2013 BUILD_TYPE: Release SHARED_LIBS: TRUE diff --git a/src/TGUI/Font.cpp b/src/TGUI/Font.cpp index a7734a55..309820f7 100644 --- a/src/TGUI/Font.cpp +++ b/src/TGUI/Font.cpp @@ -114,7 +114,13 @@ namespace tgui const sf::Glyph& Font::getGlyph(sf::Uint32 codePoint, unsigned int characterSize, bool bold, float outlineThickness) const { assert(m_font != nullptr); + + #if SFML_VERSION_MAJOR > 2 || (SFML_VERSION_MAJOR == 2 && SFML_VERSION_MINOR >= 4) return m_font->getGlyph(codePoint, characterSize, bold, outlineThickness); + #else + (void)outlineThickness; + return m_font->getGlyph(codePoint, characterSize, bold); + #endif } ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/TGUI/Text.cpp b/src/TGUI/Text.cpp index 57f5ca40..4df4855e 100644 --- a/src/TGUI/Text.cpp +++ b/src/TGUI/Text.cpp @@ -74,7 +74,12 @@ namespace tgui void Text::setColor(Color color) { m_color = color; + + #if SFML_VERSION_MAJOR > 2 || (SFML_VERSION_MAJOR == 2 && SFML_VERSION_MINOR >= 4) m_text.setFillColor(Color::calcColorOpacity(color, m_opacity)); + #else + m_text.setColor(Color::calcColorOpacity(color, m_opacity)); + #endif } ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -89,7 +94,12 @@ namespace tgui void Text::setOpacity(float opacity) { m_opacity = opacity; + + #if SFML_VERSION_MAJOR > 2 || (SFML_VERSION_MAJOR == 2 && SFML_VERSION_MINOR >= 4) m_text.setFillColor(Color::calcColorOpacity(m_color, opacity)); + #else + m_text.setColor(Color::calcColorOpacity(m_color, opacity)); + #endif } ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/tests/travis_linux_tests.sh b/tests/travis_linux_tests.sh index d6bbc07d..06405ca8 100644 --- a/tests/travis_linux_tests.sh +++ b/tests/travis_linux_tests.sh @@ -1,6 +1,6 @@ set -eo pipefail -export SFML_VERSION=2.4.0 +export SFML_VERSION=2.3 export SFML_ROOT=$HOME/SFML-${SFML_VERSION}_LINUX export DISPLAY=:99.0 sh -e /etc/init.d/xvfb start