diff --git a/amxmodx/Makefile b/amxmodx/Makefile
index 5d686020..9e077193 100755
--- a/amxmodx/Makefile
+++ b/amxmodx/Makefile
@@ -105,7 +105,7 @@ endif
 
 # Clang >= 3 || GCC >= 4.7
 ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(CPP_MINOR) \>= 7)" "1"
-	CFLAGS += -Wno-delete-non-virtual-dtor
+	CPPFLAGS += -Wno-delete-non-virtual-dtor
 endif
 
 # OS is Linux and not using clang
diff --git a/compiler/amxxpc/Makefile b/compiler/amxxpc/Makefile
index 0d834a10..50825dff 100755
--- a/compiler/amxxpc/Makefile
+++ b/compiler/amxxpc/Makefile
@@ -74,7 +74,7 @@ endif
 
 # Clang >= 3 || GCC >= 4.7
 ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(CPP_MINOR) \>= 7)" "1"
-	CFLAGS += -Wno-delete-non-virtual-dtor
+	CPPFLAGS += -Wno-delete-non-virtual-dtor
 endif
 
 # OS is Linux and not using clang
diff --git a/compiler/libpc300/Makefile b/compiler/libpc300/Makefile
index 7c084f56..3cdd3627 100755
--- a/compiler/libpc300/Makefile
+++ b/compiler/libpc300/Makefile
@@ -75,7 +75,7 @@ endif
 
 # Clang >= 3 || GCC >= 4.7
 ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(CPP_MINOR) \>= 7)" "1"
-	CFLAGS += -Wno-delete-non-virtual-dtor
+	CPPFLAGS += -Wno-delete-non-virtual-dtor
 endif
 
 # OS is Linux and not using clang
diff --git a/dlls/cstrike/cstrike/Makefile b/dlls/cstrike/cstrike/Makefile
index 1f35def9..adf9b459 100755
--- a/dlls/cstrike/cstrike/Makefile
+++ b/dlls/cstrike/cstrike/Makefile
@@ -85,7 +85,7 @@ endif
 
 # Clang >= 3 || GCC >= 4.7
 ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(CPP_MINOR) \>= 7)" "1"
-	CFLAGS += -Wno-delete-non-virtual-dtor
+	CPPFLAGS += -Wno-delete-non-virtual-dtor
 endif
 
 # OS is Linux and not using clang
diff --git a/dlls/cstrike/csx/Makefile b/dlls/cstrike/csx/Makefile
index b038f3bd..1670743c 100755
--- a/dlls/cstrike/csx/Makefile
+++ b/dlls/cstrike/csx/Makefile
@@ -85,7 +85,7 @@ endif
 
 # Clang >= 3 || GCC >= 4.7
 ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(CPP_MINOR) \>= 7)" "1"
-	CFLAGS += -Wno-delete-non-virtual-dtor
+	CPPFLAGS += -Wno-delete-non-virtual-dtor
 endif
 
 # OS is Linux and not using clang
diff --git a/dlls/dod/dodfun/Makefile b/dlls/dod/dodfun/Makefile
index 1b870014..06ed287f 100755
--- a/dlls/dod/dodfun/Makefile
+++ b/dlls/dod/dodfun/Makefile
@@ -85,7 +85,7 @@ endif
 
 # Clang >= 3 || GCC >= 4.7
 ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(CPP_MINOR) \>= 7)" "1"
-	CFLAGS += -Wno-delete-non-virtual-dtor
+	CPPFLAGS += -Wno-delete-non-virtual-dtor
 endif
 
 # OS is Linux and not using clang
diff --git a/dlls/dod/dodx/Makefile b/dlls/dod/dodx/Makefile
index 9ef72bab..196b75c7 100755
--- a/dlls/dod/dodx/Makefile
+++ b/dlls/dod/dodx/Makefile
@@ -85,7 +85,7 @@ endif
 
 # Clang >= 3 || GCC >= 4.7
 ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(CPP_MINOR) \>= 7)" "1"
-	CFLAGS += -Wno-delete-non-virtual-dtor
+	CPPFLAGS += -Wno-delete-non-virtual-dtor
 endif
 
 # OS is Linux and not using clang
diff --git a/dlls/engine/Makefile b/dlls/engine/Makefile
index aa3dc119..d22a273d 100755
--- a/dlls/engine/Makefile
+++ b/dlls/engine/Makefile
@@ -86,7 +86,7 @@ endif
 
 # Clang >= 3 || GCC >= 4.7
 ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(CPP_MINOR) \>= 7)" "1"
-	CFLAGS += -Wno-delete-non-virtual-dtor
+	CPPFLAGS += -Wno-delete-non-virtual-dtor
 endif
 
 # OS is Linux and not using clang
diff --git a/dlls/fakemeta/Makefile b/dlls/fakemeta/Makefile
index f8a3585a..3281ef85 100755
--- a/dlls/fakemeta/Makefile
+++ b/dlls/fakemeta/Makefile
@@ -87,7 +87,7 @@ endif
 
 # Clang >= 3 || GCC >= 4.7
 ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(CPP_MINOR) \>= 7)" "1"
-	CFLAGS += -Wno-delete-non-virtual-dtor
+	CPPFLAGS += -Wno-delete-non-virtual-dtor
 endif
 
 # OS is Linux and not using clang
diff --git a/dlls/fun/Makefile b/dlls/fun/Makefile
index 670a7171..a8dd0cad 100755
--- a/dlls/fun/Makefile
+++ b/dlls/fun/Makefile
@@ -85,7 +85,7 @@ endif
 
 # Clang >= 3 || GCC >= 4.7
 ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(CPP_MINOR) \>= 7)" "1"
-	CFLAGS += -Wno-delete-non-virtual-dtor
+	CPPFLAGS += -Wno-delete-non-virtual-dtor
 endif
 
 # OS is Linux and not using clang
diff --git a/dlls/geoip/Makefile b/dlls/geoip/Makefile
index fb2cb96e..2eadc466 100755
--- a/dlls/geoip/Makefile
+++ b/dlls/geoip/Makefile
@@ -85,7 +85,7 @@ endif
 
 # Clang >= 3 || GCC >= 4.7
 ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(CPP_MINOR) \>= 7)" "1"
-	CFLAGS += -Wno-delete-non-virtual-dtor
+	CPPFLAGS += -Wno-delete-non-virtual-dtor
 endif
 
 # OS is Linux and not using clang
diff --git a/dlls/hamsandwich/Makefile b/dlls/hamsandwich/Makefile
index 12b186d1..cb8d1a03 100644
--- a/dlls/hamsandwich/Makefile
+++ b/dlls/hamsandwich/Makefile
@@ -86,7 +86,7 @@ endif
 
 # Clang >= 3 || GCC >= 4.7
 ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(CPP_MINOR) \>= 7)" "1"
-	CFLAGS += -Wno-delete-non-virtual-dtor
+	CPPFLAGS += -Wno-delete-non-virtual-dtor
 endif
 
 # OS is Linux and not using clang
diff --git a/dlls/mysqlx/Makefile b/dlls/mysqlx/Makefile
index f23e1b6b..072b63ca 100755
--- a/dlls/mysqlx/Makefile
+++ b/dlls/mysqlx/Makefile
@@ -89,7 +89,7 @@ endif
 
 # Clang >= 3 || GCC >= 4.7
 ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(CPP_MINOR) \>= 7)" "1"
-	CFLAGS += -Wno-delete-non-virtual-dtor
+	CPPFLAGS += -Wno-delete-non-virtual-dtor
 endif
 
 # OS is Linux and not using clang
diff --git a/dlls/ns/Makefile b/dlls/ns/Makefile
index 9bd98cd6..7510b4a4 100755
--- a/dlls/ns/Makefile
+++ b/dlls/ns/Makefile
@@ -88,7 +88,7 @@ endif
 
 # Clang >= 3 || GCC >= 4.7
 ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(CPP_MINOR) \>= 7)" "1"
-	CFLAGS += -Wno-delete-non-virtual-dtor
+	CPPFLAGS += -Wno-delete-non-virtual-dtor
 endif
 
 # OS is Linux and not using clang
diff --git a/dlls/nvault/Makefile b/dlls/nvault/Makefile
index c74d53f6..dfd9212b 100755
--- a/dlls/nvault/Makefile
+++ b/dlls/nvault/Makefile
@@ -85,7 +85,7 @@ endif
 
 # Clang >= 3 || GCC >= 4.7
 ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(CPP_MINOR) \>= 7)" "1"
-	CFLAGS += -Wno-delete-non-virtual-dtor
+	CPPFLAGS += -Wno-delete-non-virtual-dtor
 endif
 
 # OS is Linux and not using clang
diff --git a/dlls/regex/Makefile b/dlls/regex/Makefile
index ed0e7cf0..3ec23fed 100755
--- a/dlls/regex/Makefile
+++ b/dlls/regex/Makefile
@@ -85,7 +85,7 @@ endif
 
 # Clang >= 3 || GCC >= 4.7
 ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(CPP_MINOR) \>= 7)" "1"
-	CFLAGS += -Wno-delete-non-virtual-dtor
+	CPPFLAGS += -Wno-delete-non-virtual-dtor
 endif
 
 # OS is Linux and not using clang
diff --git a/dlls/sockets/Makefile b/dlls/sockets/Makefile
index be81aa17..03db932b 100755
--- a/dlls/sockets/Makefile
+++ b/dlls/sockets/Makefile
@@ -85,7 +85,7 @@ endif
 
 # Clang >= 3 || GCC >= 4.7
 ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(CPP_MINOR) \>= 7)" "1"
-	CFLAGS += -Wno-delete-non-virtual-dtor
+	CPPFLAGS += -Wno-delete-non-virtual-dtor
 endif
 
 # OS is Linux and not using clang
diff --git a/dlls/sqlite/Makefile b/dlls/sqlite/Makefile
index 433f8c3c..5ea09b66 100755
--- a/dlls/sqlite/Makefile
+++ b/dlls/sqlite/Makefile
@@ -98,7 +98,7 @@ endif
 
 # Clang >= 3 || GCC >= 4.7
 ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(CPP_MINOR) \>= 7)" "1"
-	CFLAGS += -Wno-delete-non-virtual-dtor
+	CPPFLAGS += -Wno-delete-non-virtual-dtor
 endif
 
 # OS is Linux and not using clang
diff --git a/dlls/tfcx/Makefile b/dlls/tfcx/Makefile
index 8e03660c..0d416c18 100755
--- a/dlls/tfcx/Makefile
+++ b/dlls/tfcx/Makefile
@@ -86,7 +86,7 @@ endif
 
 # Clang >= 3 || GCC >= 4.7
 ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(CPP_MINOR) \>= 7)" "1"
-	CFLAGS += -Wno-delete-non-virtual-dtor
+	CPPFLAGS += -Wno-delete-non-virtual-dtor
 endif
 
 # OS is Linux and not using clang
diff --git a/dlls/ts/tsfun/Makefile b/dlls/ts/tsfun/Makefile
index 934426ed..8971dcfa 100755
--- a/dlls/ts/tsfun/Makefile
+++ b/dlls/ts/tsfun/Makefile
@@ -85,7 +85,7 @@ endif
 
 # Clang >= 3 || GCC >= 4.7
 ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(CPP_MINOR) \>= 7)" "1"
-	CFLAGS += -Wno-delete-non-virtual-dtor
+	CPPFLAGS += -Wno-delete-non-virtual-dtor
 endif
 
 # OS is Linux and not using clang
diff --git a/dlls/ts/tsx/Makefile b/dlls/ts/tsx/Makefile
index be9dd971..94f6700b 100755
--- a/dlls/ts/tsx/Makefile
+++ b/dlls/ts/tsx/Makefile
@@ -86,7 +86,7 @@ endif
 
 # Clang >= 3 || GCC >= 4.7
 ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(CPP_MINOR) \>= 7)" "1"
-	CFLAGS += -Wno-delete-non-virtual-dtor
+	CPPFLAGS += -Wno-delete-non-virtual-dtor
 endif
 
 # OS is Linux and not using clang