--- CMakeLists.txt.orig	2016-03-09 20:19:17 UTC
+++ CMakeLists.txt
@@ -18,12 +18,12 @@ SET(LIB_INCLUDE_DIR "${LIB_DIR}/include"
 SET(LIB_SOURCE_DIR "${LIB_DIR}/src")
 
 INCLUDE(cmake/wxWidgets.cmake)
-INCLUDE(cmake/FreeType.cmake)
+#INCLUDE(cmake/FreeType.cmake)
 INCLUDE(cmake/FreeImage.cmake)
 
-INCLUDE(cmake/GTest.cmake)
-INCLUDE(cmake/GMock.cmake)
-INCLUDE(cmake/Glew.cmake)
+#INCLUDE(cmake/GTest.cmake)
+#INCLUDE(cmake/GMock.cmake)
+#INCLUDE(cmake/Glew.cmake)
 INCLUDE(cmake/Common.cmake)
 
 # Include directories
@@ -45,12 +45,10 @@ ENDIF()
 # Compiler configuration
 IF(COMPILER_IS_CLANG)
     MESSAGE(STATUS "Compiler is Clang")
-    SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3")
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Weverything -pedantic -Wno-format -Wno-variadic-macros -Wno-c++11-long-long -Wno-c99-extensions -Wno-padded -Wno-unused-parameter -Wno-global-constructors -Wno-exit-time-destructors -Wno-weak-vtables -Wno-weak-template-vtables -Wno-float-equal -Wno-used-but-marked-unused -Wno-format-nonliteral -Wno-missing-noreturn -Wno-unused-local-typedef -stdlib=libstdc++")
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Weverything -pedantic -Wno-format -Wno-variadic-macros -Wno-c++11-long-long -Wno-c99-extensions -Wno-padded -Wno-unused-parameter -Wno-global-constructors -Wno-exit-time-destructors -Wno-weak-vtables -Wno-weak-template-vtables -Wno-float-equal -Wno-used-but-marked-unused -Wno-format-nonliteral -Wno-missing-noreturn -Wno-unused-local-typedef")
 ELSEIF(COMPILER_IS_GNU)
     MESSAGE(STATUS "Compiler is GNU")
-    SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3")
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -Wno-format -Wno-variadic-macros -Wno-padded -Wno-unused-parameter -Wno-float-equal -Wno-format-nonliteral -Wno-missing-noreturn")
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wall -Wextra -pedantic -Wno-format -Wno-variadic-macros -Wno-padded -Wno-unused-parameter -Wno-float-equal -Wno-format-nonliteral -Wno-missing-noreturn")
 ELSEIF(COMPILER_IS_MSVC)
     MESSAGE(STATUS "Compiler is MSVC")
     SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Ox")
@@ -77,4 +75,4 @@ IF(CMAKE_BUILD_TYPE MATCHES "Debug")
 ENDIF()
 
 INCLUDE(cmake/TrenchBroomApp.cmake)
-INCLUDE(cmake/TrenchBroomTest.cmake)
+#INCLUDE(cmake/TrenchBroomTest.cmake)