diff --git a/cpp/Makefile b/cpp/Makefile
index d49fb6b44ca29f1ad72ac1483b4bf9f98d7c3431..1b149ffc3945e40ab8790fdecdf0f12de52ca651 100644
--- a/cpp/Makefile
+++ b/cpp/Makefile
@@ -1,7 +1,8 @@
+#CXX=clang++
 
 INCLUDES += -I.
 
-CXXFLAGS += -std=c++14 -O3 -Wall -Wextra -Wfatal-errors -Wno-deprecated-declarations $(INCLUDES)
+CXXFLAGS += -std=c++14 -O3 -Wall -Wextra -Wfatal-errors -Werror -pedantic -Wno-deprecated-declarations $(INCLUDES)
 
 
 all: switchchain switchchain_exponent switchchain_initialtris