Merge pull request #1277 from LMMS/c++11

Enable C++11
2014-11-08 12:16:01 +02:00
parent 8f7593f82e 9d395ac0c1
commit d10eecbf5f
2 changed files with 3 additions and 2 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,7 +22,6 @@ IF(VERSION_SUFFIX)
 	SET(VERSION "${VERSION}-${VERSION_SUFFIX}")
 ENDIF(VERSION_SUFFIX)

-
 INCLUDE(DetectMachine)


@@ -443,6 +442,8 @@ ADD_SUBDIRECTORY(plugins)
 ADD_SUBDIRECTORY(data)
 ADD_SUBDIRECTORY(doc)

+# Enable C++11
+ADD_DEFINITIONS("-std=c++0x")

 #
 # build LMMS-binary
--- a/include/versioninfo.h
+++ b/include/versioninfo.h
@@ -1,5 +1,5 @@
 #ifdef __GNUC__
-#define GCC_VERSION "GCC "__VERSION__
+#define GCC_VERSION "GCC " __VERSION__
 #else
 #define GCC_VERSION "unknown compiler"
 #endif