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

some Qt6 Makefile tinkering

Browse Source 
Adjust for a package available on ubuntu jammy jellyfish 22.04 LTS,
but one that doesn't seem to follow the norm.
This commit is contained in:
nhmall
2022-06-12 11:59:34 -04:00
parent 14fec29c13
commit ca3e406601
2 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,6 +80,7 @@ CCXXFLAGS+= -Wno-deprecated-copy
endif # WANT_WIN_QT
# get the version of gcc
GCCGTEQ9 := $(shell expr `$(CC) -dumpversion | cut -f1 -d.` \>= 9)
GCCGTEQ12 := $(shell expr `$(CC) -dumpversion | cut -f1 -d.` \>= 12)
ifeq "$(GCCGTEQ9)" "1"
# flags present in gcc version greater than or equal to 9 can go here
CFLAGS+=-Wformat-overflow
@@ -87,6 +88,7 @@ endif #gcc version greater than or equal to 9
#still in gcc-specific section here
# get the version of g++
GPPGTEQ9 := $(shell expr `$(CXX) -dumpversion | cut -f1 -d.` \>= 9)
GPPGTEQ12 := $(shell expr `$(CC) -dumpversion | cut -f1 -d.` \>= 12)
ifeq "$(GPPGTEQ9)" "1"
CCXXFLAGS+=-Wformat-overflow
ifdef WANT_WIN_QT
@@ -94,6 +96,11 @@ CCXXFLAGS+=-Wno-deprecated-copy
CCXXFLAGS+=-Wno-deprecated-declarations
endif # WANT_WIN_QT
endif # g++ version greater than or equal to 9
ifeq "$(GPPGTEQ12)" "1"
ifdef WANT_WIN_QT6
CXX=g++ -std=c++20
endif
endif # g++ version greater than or equal to 12
# end of gcc-specific
else # clang-specific follows