[linux] Issue #318 - fix compile on Linux with older SFML versions

mickelson · Mar 2, 2017 · b2b4233 · b2b4233
1 parent 6c2c13d
commit b2b4233
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/fe_util.hpp b/src/fe_util.hpp
@@ -31,6 +31,9 @@
 #include <cassert>
 #endif
 
+#define FE_VERSION_INT( a, b, c ) ((a)<<16 | (b)<<8 | (c))
+#define SFML_VERSION_INT FE_VERSION_INT( SFML_VERSION_MAJOR, SFML_VERSION_MINOR, SFML_VERSION_PATCH )
+
 extern const char *FE_WHITESPACE;
 
 //

diff --git a/src/fe_window.cpp b/src/fe_window.cpp
@@ -245,8 +245,15 @@ void launch_callback( void *o )
 		// when the emulator is done).
 		//
 		sf::sleep( sf::milliseconds( 1000 ) );
+
+ // hasFocus() is only available as of SFML 2.2.
+ #if ( SFML_VERSION_INT >= FE_VERSION_INT( 2, 2, 0 ))
 		if ( win->hasFocus() )
 			win->close();
+ #else
+		win->close();
+ #endif
+
 #else
 		win->close(); // this fixes raspi version (w/sfml-pi) obscuring daphne (and others?)
 #endif