nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

more quieting of Qt6 build warnings

Browse Source
This commit is contained in:
nhmall
2024-11-20 09:56:01 -05:00
parent 3e903fd79a
commit 37793be6eb
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sys/unix/hints/include/compiler.370
View File

@@ -119,6 +119,7 @@ CCXX=g++ -std=gnu++11
GPPGTEQ9 := $(shell expr `$(CXX) -dumpversion | cut -f1 -d.` \>= 9) GPPGTEQ9 := $(shell expr `$(CXX) -dumpversion | cut -f1 -d.` \>= 9)
GPPGTEQ11 := $(shell expr `$(CXX) -dumpversion | cut -f1 -d.` \>= 11) GPPGTEQ11 := $(shell expr `$(CXX) -dumpversion | cut -f1 -d.` \>= 11)
GPPGTEQ12 := $(shell expr `$(CXX) -dumpversion | cut -f1 -d.` \>= 12) GPPGTEQ12 := $(shell expr `$(CXX) -dumpversion | cut -f1 -d.` \>= 12)
GPPGTEQ14 := $(shell expr `$(CXX) -dumpversion | cut -f1 -d.` \>= 14)
ifeq "$(GPPGTEQ9)" "1" ifeq "$(GPPGTEQ9)" "1"
CCXXFLAGS+=-Wformat-overflow CCXXFLAGS+=-Wformat-overflow
ifdef CPLUSPLUS_NEED_DEPSUPPRESS ifdef CPLUSPLUS_NEED_DEPSUPPRESS
@@ -135,7 +136,7 @@ CFLAGS+=-fPIC
endif # g++ version greater than or equal to 11 endif # g++ version greater than or equal to 11
ifdef CPLUSPLUS_NEED17 ifdef CPLUSPLUS_NEED17
ifeq "$(GPPGTEQ12)" "1" ifeq "$(GPPGTEQ12)" "1"
CCXX=g++ -std=c++20 CCXX=g++ -std=c++17
else # g++ version greater than or equal to 12? (no follows) else # g++ version greater than or equal to 12? (no follows)
CCXX=g++ -std=c++17 CCXX=g++ -std=c++17
endif # g++ version greater than or equal to 12 endif # g++ version greater than or equal to 12
@@ -171,7 +172,7 @@ ifeq "$(CLANGPPGTEQ14)" "1"
CCXX=clang++ -std=c++17 CCXX=clang++ -std=c++17
endif # clang++ greater than or equal to 14 endif # clang++ greater than or equal to 14
ifeq "$(CLANGPPGTEQ17)" "1" ifeq "$(CLANGPPGTEQ17)" "1"
CCXX=clang++ -std=c++20 CCXX=clang++ -std=c++17
endif # clang++ greater than or equal to 17 endif # clang++ greater than or equal to 17
endif # CPLUSPLUS_NEED17 endif # CPLUSPLUS_NEED17
endif # end of clang++-specific section endif # end of clang++-specific section

3
sys/unix/hints/linux.370
View File

@@ -74,6 +74,9 @@ endif # WANT_WIN_QT5
ifdef WANT_WIN_QT6 ifdef WANT_WIN_QT6
#if your Qt6 is elsewhere, change this to match #if your Qt6 is elsewhere, change this to match
QTDIR=/usr/local/qt6 QTDIR=/usr/local/qt6
ifeq "$(GPPGTEQ14)" "1"
CCXXFLAGS += -Wno-template-id-cdtor
endif # g++ greater than or equal to 14
endif # WANT_WIN_QT6 endif # WANT_WIN_QT6
endif # WANT_WIN_QT endif # WANT_WIN_QT

2
sys/unix/hints/macOS.370
View File

@@ -89,7 +89,7 @@ endif # WANT_WIN_QT
ifdef WANT_WIN_QT ifdef WANT_WIN_QT
ifeq "$(CLANGPPGTEQ16)" "1" ifeq "$(CLANGPPGTEQ16)" "1"
CXX=clang++ --std=c++20 CXX=clang++ --std=c++17
CCXXFLAGS +=-Wno-c++20-attribute-extensions CCXXFLAGS +=-Wno-c++20-attribute-extensions
endif endif
endif endif