--- CMakeLists.txt.orig	2014-11-18 15:26:49 UTC
+++ CMakeLists.txt
@@ -156,14 +156,12 @@ endif()
 # necessary and required modules checked, ready to generate config.h in top-level build directory
 configure_file(config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
 
-add_definitions(-g -O2 -fno-strict-aliasing)
+add_definitions(-fno-strict-aliasing)
 if(CMAKE_COMPILER_IS_GNUCXX)
 #    add_definitions(-Wno-long-long -Wno-char-subscripts)
 #    add_definitions(-Wall -ansi -pedantic)
 #    add_definitions(-Wall -pedantic)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -pedantic -std=c99")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -std=c++11")
-    add_definitions(-DNEW_STDCPP)
 endif()
 
 include_directories(BEFORE ${CMAKE_BINARY_DIR})
