mirror of
https://github.com/alliedmodders/amxmodx.git
synced 2024-12-24 13:55:36 +03:00
Fix Wno-delete-non-virtual-dtor flag to be passed only for .cpp files.
This commit is contained in:
parent
39fadf4302
commit
4f8b31483d
@ -105,7 +105,7 @@ endif
|
|||||||
|
|
||||||
# Clang >= 3 || GCC >= 4.7
|
# Clang >= 3 || GCC >= 4.7
|
||||||
ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(CPP_MINOR) \>= 7)" "1"
|
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
|
endif
|
||||||
|
|
||||||
# OS is Linux and not using clang
|
# OS is Linux and not using clang
|
||||||
|
@ -74,7 +74,7 @@ endif
|
|||||||
|
|
||||||
# Clang >= 3 || GCC >= 4.7
|
# Clang >= 3 || GCC >= 4.7
|
||||||
ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(CPP_MINOR) \>= 7)" "1"
|
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
|
endif
|
||||||
|
|
||||||
# OS is Linux and not using clang
|
# OS is Linux and not using clang
|
||||||
|
@ -75,7 +75,7 @@ endif
|
|||||||
|
|
||||||
# Clang >= 3 || GCC >= 4.7
|
# Clang >= 3 || GCC >= 4.7
|
||||||
ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(CPP_MINOR) \>= 7)" "1"
|
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
|
endif
|
||||||
|
|
||||||
# OS is Linux and not using clang
|
# OS is Linux and not using clang
|
||||||
|
@ -85,7 +85,7 @@ endif
|
|||||||
|
|
||||||
# Clang >= 3 || GCC >= 4.7
|
# Clang >= 3 || GCC >= 4.7
|
||||||
ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(CPP_MINOR) \>= 7)" "1"
|
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
|
endif
|
||||||
|
|
||||||
# OS is Linux and not using clang
|
# OS is Linux and not using clang
|
||||||
|
@ -85,7 +85,7 @@ endif
|
|||||||
|
|
||||||
# Clang >= 3 || GCC >= 4.7
|
# Clang >= 3 || GCC >= 4.7
|
||||||
ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(CPP_MINOR) \>= 7)" "1"
|
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
|
endif
|
||||||
|
|
||||||
# OS is Linux and not using clang
|
# OS is Linux and not using clang
|
||||||
|
@ -85,7 +85,7 @@ endif
|
|||||||
|
|
||||||
# Clang >= 3 || GCC >= 4.7
|
# Clang >= 3 || GCC >= 4.7
|
||||||
ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(CPP_MINOR) \>= 7)" "1"
|
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
|
endif
|
||||||
|
|
||||||
# OS is Linux and not using clang
|
# OS is Linux and not using clang
|
||||||
|
@ -85,7 +85,7 @@ endif
|
|||||||
|
|
||||||
# Clang >= 3 || GCC >= 4.7
|
# Clang >= 3 || GCC >= 4.7
|
||||||
ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(CPP_MINOR) \>= 7)" "1"
|
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
|
endif
|
||||||
|
|
||||||
# OS is Linux and not using clang
|
# OS is Linux and not using clang
|
||||||
|
@ -86,7 +86,7 @@ endif
|
|||||||
|
|
||||||
# Clang >= 3 || GCC >= 4.7
|
# Clang >= 3 || GCC >= 4.7
|
||||||
ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(CPP_MINOR) \>= 7)" "1"
|
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
|
endif
|
||||||
|
|
||||||
# OS is Linux and not using clang
|
# OS is Linux and not using clang
|
||||||
|
@ -87,7 +87,7 @@ endif
|
|||||||
|
|
||||||
# Clang >= 3 || GCC >= 4.7
|
# Clang >= 3 || GCC >= 4.7
|
||||||
ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(CPP_MINOR) \>= 7)" "1"
|
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
|
endif
|
||||||
|
|
||||||
# OS is Linux and not using clang
|
# OS is Linux and not using clang
|
||||||
|
@ -85,7 +85,7 @@ endif
|
|||||||
|
|
||||||
# Clang >= 3 || GCC >= 4.7
|
# Clang >= 3 || GCC >= 4.7
|
||||||
ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(CPP_MINOR) \>= 7)" "1"
|
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
|
endif
|
||||||
|
|
||||||
# OS is Linux and not using clang
|
# OS is Linux and not using clang
|
||||||
|
@ -85,7 +85,7 @@ endif
|
|||||||
|
|
||||||
# Clang >= 3 || GCC >= 4.7
|
# Clang >= 3 || GCC >= 4.7
|
||||||
ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(CPP_MINOR) \>= 7)" "1"
|
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
|
endif
|
||||||
|
|
||||||
# OS is Linux and not using clang
|
# OS is Linux and not using clang
|
||||||
|
@ -86,7 +86,7 @@ endif
|
|||||||
|
|
||||||
# Clang >= 3 || GCC >= 4.7
|
# Clang >= 3 || GCC >= 4.7
|
||||||
ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(CPP_MINOR) \>= 7)" "1"
|
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
|
endif
|
||||||
|
|
||||||
# OS is Linux and not using clang
|
# OS is Linux and not using clang
|
||||||
|
@ -89,7 +89,7 @@ endif
|
|||||||
|
|
||||||
# Clang >= 3 || GCC >= 4.7
|
# Clang >= 3 || GCC >= 4.7
|
||||||
ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(CPP_MINOR) \>= 7)" "1"
|
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
|
endif
|
||||||
|
|
||||||
# OS is Linux and not using clang
|
# OS is Linux and not using clang
|
||||||
|
@ -88,7 +88,7 @@ endif
|
|||||||
|
|
||||||
# Clang >= 3 || GCC >= 4.7
|
# Clang >= 3 || GCC >= 4.7
|
||||||
ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(CPP_MINOR) \>= 7)" "1"
|
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
|
endif
|
||||||
|
|
||||||
# OS is Linux and not using clang
|
# OS is Linux and not using clang
|
||||||
|
@ -85,7 +85,7 @@ endif
|
|||||||
|
|
||||||
# Clang >= 3 || GCC >= 4.7
|
# Clang >= 3 || GCC >= 4.7
|
||||||
ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(CPP_MINOR) \>= 7)" "1"
|
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
|
endif
|
||||||
|
|
||||||
# OS is Linux and not using clang
|
# OS is Linux and not using clang
|
||||||
|
@ -85,7 +85,7 @@ endif
|
|||||||
|
|
||||||
# Clang >= 3 || GCC >= 4.7
|
# Clang >= 3 || GCC >= 4.7
|
||||||
ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(CPP_MINOR) \>= 7)" "1"
|
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
|
endif
|
||||||
|
|
||||||
# OS is Linux and not using clang
|
# OS is Linux and not using clang
|
||||||
|
@ -85,7 +85,7 @@ endif
|
|||||||
|
|
||||||
# Clang >= 3 || GCC >= 4.7
|
# Clang >= 3 || GCC >= 4.7
|
||||||
ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(CPP_MINOR) \>= 7)" "1"
|
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
|
endif
|
||||||
|
|
||||||
# OS is Linux and not using clang
|
# OS is Linux and not using clang
|
||||||
|
@ -98,7 +98,7 @@ endif
|
|||||||
|
|
||||||
# Clang >= 3 || GCC >= 4.7
|
# Clang >= 3 || GCC >= 4.7
|
||||||
ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(CPP_MINOR) \>= 7)" "1"
|
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
|
endif
|
||||||
|
|
||||||
# OS is Linux and not using clang
|
# OS is Linux and not using clang
|
||||||
|
@ -86,7 +86,7 @@ endif
|
|||||||
|
|
||||||
# Clang >= 3 || GCC >= 4.7
|
# Clang >= 3 || GCC >= 4.7
|
||||||
ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(CPP_MINOR) \>= 7)" "1"
|
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
|
endif
|
||||||
|
|
||||||
# OS is Linux and not using clang
|
# OS is Linux and not using clang
|
||||||
|
@ -85,7 +85,7 @@ endif
|
|||||||
|
|
||||||
# Clang >= 3 || GCC >= 4.7
|
# Clang >= 3 || GCC >= 4.7
|
||||||
ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(CPP_MINOR) \>= 7)" "1"
|
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
|
endif
|
||||||
|
|
||||||
# OS is Linux and not using clang
|
# OS is Linux and not using clang
|
||||||
|
@ -86,7 +86,7 @@ endif
|
|||||||
|
|
||||||
# Clang >= 3 || GCC >= 4.7
|
# Clang >= 3 || GCC >= 4.7
|
||||||
ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(CPP_MINOR) \>= 7)" "1"
|
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
|
endif
|
||||||
|
|
||||||
# OS is Linux and not using clang
|
# OS is Linux and not using clang
|
||||||
|
Loading…
Reference in New Issue
Block a user