From 849709ec1d0e9336c996dd56ca7a7408609627c4 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Sat, 12 Apr 2014 00:07:19 +0200
Subject: [PATCH] Revert some CPP2011 related changes.

---
 CMakeLists.txt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 77e9f0a6c..aec8eb348 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,6 +13,9 @@ endif()
 
 option(USE_WIIUSE "Support for wiimote input devices" ON)
 option(USE_FRIBIDI "Support for right-to-left languages" ON)
+if(UNIX)
+    option(USE_CPP2011 "Activate C++ 2011 mode (GCC only)" OFF)
+endif()
 if(MSVC)
     # Normally hide the option to build wiiuse on VS, since it depends
     # on the installation of the Windows DDK (Driver Developer Kit), 
@@ -113,7 +116,9 @@ if(USE_FRIBIDI)
 endif()
 
 if(UNIX)
-    add_definitions("-std=c++0x")
+    if(USE_CPP2011)
+        add_definitions("-std=c++0x")
+    endif()
 endif()
 
 # OpenGL