diff --git a/make/defs.mk b/make/defs.mk
index a24e3496..474c71ea 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -263,9 +263,15 @@ ifeq ($(USE_COMPILER_DEBUG_OPTS),true)
 	PROJECT_CFLAGS      += -Wall -g3
 	PROJECT_CPPFLAGS    += -Wall -g3
 	PROJECT_LDFLAGS     += -Wall -g3
+endif
+
+ifeq ($(USE_COMPILER_OPTIMIZATION_OPTS),true)
+	PROJECT_CFLAGS      += -funroll-loops -O2
+	PROJECT_CPPFLAGS    += -funroll-loops -O2
 else
-	ifeq ($(USE_COMPILER_OPTIMIZATION_OPTS),true)
-		PROJECT_CFLAGS   += -funroll-loops -O2 -DNDEBUG
+	ifneq ($(USE_COMPILER_DEBUG_OPTS),true)
+		PROJECT_CFLAGS      += -DNDEBUG
+		PROJECT_CPPFLAGS    += -DNDEBUG
 	endif
 endif