3f93d54b66
1. remove all window interface bits from compiler.370, and have the preceding include files set some variables to control the behavior of compiler.370 when it comes to c++. 2. some more common Makefile lines into sys/unix/hints/include/multiw-3.370. 3. make it so you can pass cppregex=1 on the Make command line to build with sys/share/cppregex.cpp instead of posixregex.c 4. fix sys/share/cppregex.cpp so that it will build with clang compiler (required an additional header include). I don't know if it would have worked with g++ without that change. The include can be placed into an #ifdef block if there's an issue with the change on other compilers. 5. Anything that needs to compile using c++ (Qt, sys/share/cppregex.cpp) can just ensure that CPLUSPLUS_NEEDED Makefile variable is set above the lines in compiler.370 to ensure that things get set up for c++. It no longer checks specifically for Qt. That is what sys/unix/hints/include/multiw-2.370 does now.
158 lines
5.2 KiB
Plaintext
Executable File
158 lines
5.2 KiB
Plaintext
Executable File
#------------------------------------------------------------------------------
|
|
# NetHack 3.7 compiler.370 $NHDT-Date: 1668359835 2022/11/13 17:17:15 $ $NHDT-Branch: NetHack-3.7 $
|
|
|
|
# compiler flags: CCFLAGS is used to construct a value for CFLAGS with
|
|
# various -I, -D, and -W settings appended below;
|
|
# these are the settings of most interest for an end-user build
|
|
# (clang doesn't support '-Og', gcc needs 4.x or later)
|
|
CCFLAGS = -g
|
|
#CCFLAGS = -g -Og
|
|
#CCFLAGS = -O2
|
|
# Note: this is not the usual 'CFLAGS' which is used in default
|
|
# rules for compiling C code; specifying a value for that on the
|
|
# 'make' command line should be avoided.
|
|
|
|
#If you want to force use of one particular set of compilers, do it
|
|
#here, ahead of the detection, so that the detection will match your
|
|
#choice and set variables CCISCLANG, GCCGTEQ, CLANGPPGTEQ9 etc.
|
|
#accordingly.
|
|
#
|
|
#CC= gcc
|
|
#CXX= g++ -std-gnu++11
|
|
#
|
|
#CC= clang
|
|
#CXX=clang++ -std=gnu++11
|
|
#
|
|
# If these are set on entry, preparation for C++ compiles is affected.
|
|
# CPLUSPLUS_NEEDED = 1 C++ compile bits included
|
|
# CPLUSPLUS_NEED17 = 1 C++ -std=c++17 (at least)
|
|
# CPLUSPLUS_NEED_DEPSUPPRESS = 1 C++ -Wno-deprecated-copy,
|
|
# -Wno-deprecated-declarations
|
|
|
|
|
|
# If you want to override the compiler detection just carried out
|
|
# uncomment one of the following pairs. Note, however, that
|
|
# doing this after the detection above will likely result in
|
|
# mismatched variable values for CCISCLANG, GCCGTEQ, CLANGPPGTEQ9 etc.
|
|
#
|
|
#CC= gcc
|
|
#CXX= g++ -std-gnu++11
|
|
#
|
|
#CC= clang
|
|
#CXX=clang++ -std=gnu++11
|
|
|
|
CFLAGS=$(CCFLAGS) -I../include -DNOTPARMDECL
|
|
CFLAGS+=-Wall -Wextra -Wno-missing-field-initializers \
|
|
-Wreturn-type -Wunused -Wformat -Wswitch -Wshadow -Wwrite-strings
|
|
CFLAGS+=-pedantic
|
|
CFLAGS+=-Wmissing-declarations
|
|
|
|
# these are left out of the C++ flags
|
|
CFLAGS+=-Wformat-nonliteral
|
|
CFLAGS+=-Wunreachable-code
|
|
|
|
#
|
|
# the following are not allowed in C++
|
|
CFLAGS+=-Wimplicit
|
|
CFLAGS+=-Wimplicit-function-declaration
|
|
CFLAGS+=-Wimplicit-int
|
|
CFLAGS+=-Wmissing-prototypes
|
|
CFLAGS+=-Wold-style-definition
|
|
CFLAGS+=-Wstrict-prototypes
|
|
|
|
#detection of clang vs gcc
|
|
CCISCLANG := $(shell echo `$(CC) --version` | grep clang)
|
|
ifeq "$(CCISCLANG)" ""
|
|
# gcc-specific follows
|
|
CXX=g++ -std=gnu++11
|
|
# get the version of gcc
|
|
GCCGTEQ9 := $(shell expr `$(CC) -dumpversion | cut -f1 -d.` \>= 9)
|
|
GCCGTEQ11 := $(shell expr `$(CC) -dumpversion | cut -f1 -d.` \>= 11)
|
|
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
|
|
CFLAGS+=-Wmissing-parameter-type
|
|
endif # GCC greater than or equal to 9
|
|
#ifeq "$(GCCGTEQ11)" "1"
|
|
#endif
|
|
#ifeq "$(GCCGTEQ12)" "1"
|
|
#endif
|
|
# end of gcc-specific
|
|
else # gcc or clang?
|
|
CXX=clang++ -std=gnu++11
|
|
# clang-specific follows
|
|
# none
|
|
endif # clang-specific ends here
|
|
|
|
ifdef MAKEFILE_SRC
|
|
ifdef CPLUSPLUS_NEEDED
|
|
CCXXFLAGS = -g -I../include -DNOTPARMDECL
|
|
CCXXFLAGS+=-Wall -Wextra -Wno-missing-field-initializers \
|
|
-Wreturn-type -Wunused -Wformat -Wswitch -Wshadow -Wwrite-strings
|
|
CCXXFLAGS+=-pedantic
|
|
CCXXFLAGS+=-Wmissing-declarations
|
|
#detection of clang++ vs g++
|
|
CXXISCLANG := $(shell echo `$(CXX) --version` | grep clang)
|
|
ifeq "$(CXXISCLANG)" ""
|
|
# g++-specific
|
|
CCXX=g++ -std=gnu++11
|
|
# get the version of g++
|
|
GPPGTEQ9 := $(shell expr `$(CXX) -dumpversion | cut -f1 -d.` \>= 9)
|
|
GPPGTEQ11 := $(shell expr `$(CXX) -dumpversion | cut -f1 -d.` \>= 11)
|
|
GPPGTEQ12 := $(shell expr `$(CXX) -dumpversion | cut -f1 -d.` \>= 12)
|
|
ifeq "$(GPPGTEQ9)" "1"
|
|
CCXXFLAGS+=-Wformat-overflow
|
|
ifdef CPLUSPLUS_NEED_DEPSUPPRESS
|
|
CCXXFLAGS+=-Wno-deprecated-copy
|
|
CCXXFLAGS+=-Wno-deprecated-declarations
|
|
endif # CPLUSPLUS_NEED_DEPSUPPRESS
|
|
endif # g++ version greater than or equal to 9
|
|
ifeq "$(GPPGTEQ11)" "1"
|
|
# the g++ linker will have trouble linking if the following isn't included
|
|
# when compiling the C files.
|
|
CFLAGS+=-fPIC
|
|
endif # g++ version greater than or equal to 11
|
|
ifdef CPLUSPLUS_NEED17
|
|
ifeq "$(GPPGTEQ12)" "1"
|
|
CCXX=g++ -std=c++20
|
|
else # g++ version greater than or equal to 12? (no follows)
|
|
CCXX=g++ -std=c++17
|
|
endif # g++ version greater than or equal to 12
|
|
endif # CPLUSPLUS_NEED17
|
|
|
|
else # g++ or clang++ ?
|
|
|
|
# clang++-specific
|
|
CCXX=clang++ -std=c++11
|
|
# get the version of clang++
|
|
CLANGPPGTEQ9 := $(shell expr `$(CXX) -dumpversion | cut -f1 -d.` \>= 9)
|
|
CLANGPPGTEQ14 := $(shell expr `$(CXX) -dumpversion | cut -f1 -d.` \>= 14)
|
|
ifeq "$(CLANGPPGTEQ9)" "1"
|
|
#CCXXFLAGS+=-Wformat-overflow
|
|
CCXXFLAGS+=-Wno-deprecated-copy
|
|
endif # clang++ greater than or equal to 9
|
|
ifeq "$(CLANGPPGTEQ14)" "1"
|
|
CCXXFLAGS+=-Wno-deprecated-declarations
|
|
endif # clang++ greater than or equal to 14
|
|
# The clang++ linker seems to have trouble linking if the following isn't
|
|
# included when compiling the C files by clang..
|
|
CFLAGS+=-fPIC
|
|
ifdef CPLUSPLUS_NEED17
|
|
ifeq "$(CLANGPPGTEQ14)" "1"
|
|
$(info greaterthanorequalto14)
|
|
CCXX=clang++ -std=c++20
|
|
else
|
|
$(info not greaterthanorequalto14)
|
|
CCXX=clang++ -std=c++17
|
|
endif # clang++ greater than or equal to 14
|
|
endif # CPLUSPLUS_NEED17
|
|
endif # end of clang++-specific section
|
|
endif # CPLUSPLUS_NEEDED
|
|
|
|
CXX=$(CCXX)
|
|
endif # MAKEFILE_SRC
|
|
|
|
#end of compiler.370
|
|
#------------------------------------------------------------------------------
|