diff --git a/data/glest_game b/data/glest_game
index a1e6be218..c256b6919 160000
--- a/data/glest_game
+++ b/data/glest_game
@@ -1 +1 @@
-Subproject commit a1e6be21823b1c597129e3c81f4301177c32fba7
+Subproject commit c256b69196d8aae7f00b833e75d6acdcb73953b0
diff --git a/source/g3d_viewer/CMakeLists.txt b/source/g3d_viewer/CMakeLists.txt
index 3a70f8f81..945e57ec9 100644
--- a/source/g3d_viewer/CMakeLists.txt
+++ b/source/g3d_viewer/CMakeLists.txt
@@ -7,14 +7,13 @@ SET(TARGET_NAME_MANPAGE "${TARGET_NAME}.6")
 IF(BUILD_MEGAGLEST_MODEL_VIEWER)
 	MESSAGE(STATUS "Will try to build MegaGlest model viewer")
 	
-	IF(UNIX AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+	IF(UNIX AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
 		IF("${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS 4.7 OR NOT "${CMAKE_CXX_COMPILER_VERSION}")
 			ADD_DEFINITIONS("-std=gnu++0x")
 		ELSEIF("${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS 5.1)
 			ADD_DEFINITIONS("-std=c++11")
 		ENDIF()
-		# Was required at least on bsd and macos, on linux most likely not but we probably want to see same output on
-		# linux too, e.g. deprecation warnings especially when newer than c++11 "standard" is on the way.
+		# Was required at least on bsd and macos.
 	ENDIF()
 
 	FIND_PACKAGE(${SDL_VERSION_NAME} REQUIRED)
diff --git a/source/glest_map_editor/CMakeLists.txt b/source/glest_map_editor/CMakeLists.txt
index c3c8024ed..f12617cf4 100644
--- a/source/glest_map_editor/CMakeLists.txt
+++ b/source/glest_map_editor/CMakeLists.txt
@@ -7,14 +7,13 @@ SET(TARGET_NAME_MANPAGE "${TARGET_NAME}.6")
 IF(BUILD_MEGAGLEST_MAP_EDITOR)
 	MESSAGE(STATUS "Will try to build MegaGlest map editor")
 	
-	IF(UNIX AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+	IF(UNIX AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
 		IF("${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS 4.7 OR NOT "${CMAKE_CXX_COMPILER_VERSION}")
 			ADD_DEFINITIONS("-std=gnu++0x")
 		ELSEIF("${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS 5.1)
 			ADD_DEFINITIONS("-std=c++11")
 		ENDIF()
-		# Was required at least on bsd and macos, on linux most likely not but we probably want to see same output on
-		# linux too, e.g. deprecation warnings especially when newer than c++11 "standard" is on the way.
+		# Was required at least on bsd and macos.
 	ENDIF()
 
 	FIND_PACKAGE(${SDL_VERSION_NAME} REQUIRED)