1 files changed, 7 insertions, 0 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c40767d20..57b200a2a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,6 +60,9 @@ else()
 		set(CMAKE_CXX_FLAGS_DEBUG   "${CMAKE_CXX_FLAGS_DEBUG}   -std=c++11")
 		set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -std=c++11")
 	endif()
+
+	# We use a signed char (fixes #640 on RasPi)
+	add_flags_cxx("-fsigned-char")
 endif()
 
 
@@ -121,6 +124,10 @@ endif()
 # The Expat library is linked in statically, make the source files aware of that:
 add_definitions(-DXML_STATIC)
 
+# Self Test Mode enables extra checks at startup
+if(${SELF_TEST})
+	add_definitions(-DSELF_TEST)
+endif()
 
 # Declare the flags used for profiling builds:
 if (MSVC)