Ticket #2330: c++11.diff

build/premake/premake4.lua

@@ -16 +16 @@
 newoption { trigger = "with-system-enet", description = "Search standard paths for libenet, instead of using bundled copy" }
 newoption { trigger = "with-system-miniupnpc", description = "Search standard paths for libminiupnpc, instead of using bundled copy" }
 newoption { trigger = "with-system-mozjs185", description = "Search standard paths for libmozjs185, instead of using bundled copy" }
-newoption { trigger = "with-c++11", description = "Enable C++11 on GCC" }
 newoption { trigger = "sysroot", description = "Set compiler system root path, used for building against a non-system SDK. For example /usr/local becomes SYSROOT/user/local" }
 newoption { trigger = "macosx-version-min", description = "Set minimum required version of the OS X API, the build will possibly fail if an older SDK is used, while newer API functions will be weakly linked (i.e. resolved at runtime)" }
 newoption { trigger = "macosx-bundle", description = "Enable OSX bundle, the argument is the bundle identifier string (e.g. com.wildfiregames.0ad)" }
@@ -106 +105 @@
         minor = 0+minor
         has_broken_pch = (major < 4 or (major == 4 and minor < 2))
         if has_broken_pch then
-            print("WARNING: Detected GCC <4.2 -- disabling PCH for Atlas (will increase build times)")
+            print("WARNING: Detected GCC < 4.2 -- disabling PCH for Atlas (will increase build times)")
         end
     end
 end
@@ -288 +287 @@
                 end
             end
             
-            if _OPTIONS["with-c++11"] then
+            has_cpp11 = (major > 4 or (major == 4 and minor >= 8))
+            if has_cpp11 then
                 buildoptions {
                     -- Enable C++11 standard. VS2010 and higher automatically support C++11
                     -- but we have to enable it manually on GNU C++ and Intel C++
-                    "-std=c++0x"
+                    "-std=c++11"
                 }
             end