hints files from .370 to .500
This commit is contained in:
nhmall
@@ -1,5 +1,5 @@
|
|||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
# NetHack 3.7 compiler.370 $NHDT-Date: 1668359835 2022/11/13 17:17:15 $ $NHDT-Branch: NetHack-3.7 $
|
# NetHack 3.7 compiler.500 $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
|
# compiler flags: CCFLAGS is used to construct a value for CFLAGS with
|
||||||
# various -I, -D, and -W settings appended below;
|
# various -I, -D, and -W settings appended below;
|
||||||
@@ -262,5 +262,5 @@ ifneq "$(HAVECSTD)" ""
|
|||||||
CSTD = -std=$(HAVECSTD)
|
CSTD = -std=$(HAVECSTD)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
#end of compiler.370
|
#end of compiler.500
|
||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
@@ -328,7 +328,7 @@ WASM_CFLAGS += -Wshadow
|
|||||||
# WASM_CFLAGS += -Wwrite-strings
|
# WASM_CFLAGS += -Wwrite-strings
|
||||||
# WASM_CFLAGS += -Werror
|
# WASM_CFLAGS += -Werror
|
||||||
# Nethack C flags
|
# Nethack C flags
|
||||||
WASM_CFLAGS += $(WINCFLAGS) #WINCFLAGS set from multiw-2.370
|
WASM_CFLAGS += $(WINCFLAGS) #WINCFLAGS set from multiw-2.500
|
||||||
WASM_CFLAGS += -DSYSCF -DSYSCF_FILE=\"/sysconf\" -DSECURE
|
WASM_CFLAGS += -DSYSCF -DSYSCF_FILE=\"/sysconf\" -DSECURE
|
||||||
#WASM_CFLAGS += -g -I../include -DNOTPARMDECL
|
#WASM_CFLAGS += -g -I../include -DNOTPARMDECL
|
||||||
WASM_CFLAGS += -I../include -DNOTPARMDECL
|
WASM_CFLAGS += -I../include -DNOTPARMDECL
|
||||||
@@ -470,7 +470,7 @@ ifdef CROSS_TO_AMIGA
|
|||||||
#
|
#
|
||||||
# Cross-compiler: https://franke.ms/git/bebbo/amiga-gcc
|
# Cross-compiler: https://franke.ms/git/bebbo/amiga-gcc
|
||||||
# Install to /opt/amiga, then:
|
# Install to /opt/amiga, then:
|
||||||
# sys/unix/setup.sh sys/unix/hints/linux.370
|
# sys/unix/setup.sh sys/unix/hints/linux.500
|
||||||
# make fetch-lua
|
# make fetch-lua
|
||||||
# make CROSS_TO_AMIGA=1 fetch-regex
|
# make CROSS_TO_AMIGA=1 fetch-regex
|
||||||
# make CROSS_TO_AMIGA=1 all
|
# make CROSS_TO_AMIGA=1 all
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
# NetHack 3.7 gbdates-post.370 $NHDT-Date: 1599687610 2020/09/09 21:40:10 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.11 $
|
# NetHack 3.7 gbdates-post.500 $NHDT-Date: 1599687610 2020/09/09 21:40:10 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.11 $
|
||||||
ifdef MAKEFILE_DOC
|
ifdef MAKEFILE_DOC
|
||||||
ifdef GB_DATESTAMP
|
ifdef GB_DATESTAMP
|
||||||
Guidebook.dated.mn: $(GUIDEBOOK_MN_SRC)
|
Guidebook.dated.mn: $(GUIDEBOOK_MN_SRC)
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
# NetHack 3.7 gbdates-pre.370 $NHDT-Date: 1599687610 2020/09/09 21:40:10 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.11 $
|
# NetHack 3.7 gbdates-pre.500 $NHDT-Date: 1599687610 2020/09/09 21:40:10 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.11 $
|
||||||
|
|
||||||
ifdef MAKEFILE_DOC
|
ifdef MAKEFILE_DOC
|
||||||
ifneq "$(GIT)" "0"
|
ifneq "$(GIT)" "0"
|
||||||
@@ -1,11 +1,11 @@
|
|||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
# NetHack 3.7 misc.370 $NHDT-Date: 1668359836 2022/11/13 17:17:16 $ $NHDT-Branch: NetHack-3.7 $
|
# NetHack 3.7 misc.500 $NHDT-Date: 1668359836 2022/11/13 17:17:16 $ $NHDT-Branch: NetHack-3.7 $
|
||||||
#
|
#
|
||||||
# Further set-up for miscellaneous odds and ends (after compiler.370)
|
# Further set-up for miscellaneous odds and ends (after compiler.500)
|
||||||
#
|
#
|
||||||
# Included from:
|
# Included from:
|
||||||
# hints/linux.370
|
# hints/linux.500
|
||||||
# hints/macOS.370
|
# hints/macOS.500
|
||||||
#
|
#
|
||||||
|
|
||||||
# This ensures that .moc files are compatible with the version of Qt chosen.
|
# This ensures that .moc files are compatible with the version of Qt chosen.
|
||||||
@@ -105,6 +105,6 @@ endif # end groff less than 1.23
|
|||||||
endif # end groff-specific
|
endif # end groff-specific
|
||||||
endif # not USE_MANDOC
|
endif # not USE_MANDOC
|
||||||
|
|
||||||
#end of hints/include/misc.370
|
#end of hints/include/misc.500
|
||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
|
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
# NetHack 3.7 multisnd-post.370 $NHDT-Date: 1597332785 2020/08/13 15:33:05 $ $NHDT-Branch: NetHack-3.7 $
|
# NetHack 3.7 multisnd-post.500 $NHDT-Date: 1597332785 2020/08/13 15:33:05 $ $NHDT-Branch: NetHack-3.7 $
|
||||||
|
|
||||||
ifeq "$(HAVE_SNDLIB)" "1"
|
ifeq "$(HAVE_SNDLIB)" "1"
|
||||||
# note: one possible value for $(SNDLIBSRC) is 'macsound.m' which is written
|
# note: one possible value for $(SNDLIBSRC) is 'macsound.m' which is written
|
||||||
@@ -21,6 +21,6 @@ $(WAVDIR)/%.wav: ../util/uudecode $(WAVDIR)/%.uu
|
|||||||
endif # NEEDS_WAV
|
endif # NEEDS_WAV
|
||||||
endif # HAVE_SNDLIB
|
endif # HAVE_SNDLIB
|
||||||
|
|
||||||
# end of multisnd-post.370
|
# end of multisnd-post.500
|
||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
|
|
||||||
@@ -1,9 +1,9 @@
|
|||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
# NetHack 3.7 multisnd1-pre.370 $NHDT-Date: 1597332785 2020/08/13 15:33:05 $ $NHDT-Branch: NetHack-3.7 $
|
# NetHack 3.7 multisnd1-pre.500 $NHDT-Date: 1597332785 2020/08/13 15:33:05 $ $NHDT-Branch: NetHack-3.7 $
|
||||||
#
|
#
|
||||||
# If it's cross-platform it belongs in this file.
|
# If it's cross-platform it belongs in this file.
|
||||||
# If it's macOS-only, it belongs in macOS.370.
|
# If it's macOS-only, it belongs in macOS.500.
|
||||||
# If it's linux-only, it belongs in linux.370.
|
# If it's linux-only, it belongs in linux.500.
|
||||||
#
|
#
|
||||||
|
|
||||||
#ifdef WANT_TESTSOUND
|
#ifdef WANT_TESTSOUND
|
||||||
@@ -26,8 +26,8 @@ endif # HAVE_SNDLIB
|
|||||||
# HAVE_SNDLIB or NEEDS_SND_USERSOUNDS or NEEDS_SND_SEAUTOMAP
|
# HAVE_SNDLIB or NEEDS_SND_USERSOUNDS or NEEDS_SND_SEAUTOMAP
|
||||||
# would have to be set prior to this. Any of them could have
|
# would have to be set prior to this. Any of them could have
|
||||||
# been set just above, or they could have been set in
|
# been set just above, or they could have been set in
|
||||||
# multiw-2 for Qt, or they could have been set in macOS.370
|
# multiw-2 for Qt, or they could have been set in macOS.500
|
||||||
# or linux.370 for something platform-specific.
|
# or linux.500 for something platform-specific.
|
||||||
# Regardless, if one of those is set, the related preprocessor
|
# Regardless, if one of those is set, the related preprocessor
|
||||||
# defines need to be added to SNDCFLAGS here.
|
# defines need to be added to SNDCFLAGS here.
|
||||||
#
|
#
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
# NetHack 3.7 multisnd2-pre.370 $NHDT-Date: 1597332785 2020/08/13 15:33:05 $ $NHDT-Branch: NetHack-3.7 $
|
# NetHack 3.7 multisnd2-pre.500 $NHDT-Date: 1597332785 2020/08/13 15:33:05 $ $NHDT-Branch: NetHack-3.7 $
|
||||||
#
|
#
|
||||||
|
|
||||||
ifdef NEEDS_WAV
|
ifdef NEEDS_WAV
|
||||||
@@ -27,6 +27,6 @@ SNDWAVS = se_squeak_A se_squeak_B se_squeak_B_flat se_squeak_C se_squeak_D \
|
|||||||
WAVS = $(addprefix $(WAVDIR)/, $(addsuffix .wav, $(SNDWAVS)))
|
WAVS = $(addprefix $(WAVDIR)/, $(addsuffix .wav, $(SNDWAVS)))
|
||||||
endif # NEEDS_WAV
|
endif # NEEDS_WAV
|
||||||
|
|
||||||
# end of multisnd2-pre.370
|
# end of multisnd2-pre.500
|
||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
|
|
||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
# NetHack 3.7 multiw-1.370 $NHDT-Date: 1597332785 2020/08/13 15:33:05 $ $NHDT-Branch: NetHack-3.7 $
|
# NetHack 3.7 multiw-1.500 $NHDT-Date: 1597332785 2020/08/13 15:33:05 $ $NHDT-Branch: NetHack-3.7 $
|
||||||
|
|
||||||
# 1. Which windowing interface(s) should be included in this binary?
|
# 1. Which windowing interface(s) should be included in this binary?
|
||||||
# One or more of these can be manually uncommented and/or can be specified
|
# One or more of these can be manually uncommented and/or can be specified
|
||||||
@@ -19,5 +19,5 @@
|
|||||||
#WANT_DEFAULT=Qt
|
#WANT_DEFAULT=Qt
|
||||||
#WANT_DEFAULT=X11
|
#WANT_DEFAULT=X11
|
||||||
|
|
||||||
#end of multiw-1.370
|
#end of multiw-1.500
|
||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
@@ -1,11 +1,11 @@
|
|||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
# NetHack 3.7 multiw-2.370 $NHDT-Date: 1599337709 2020/09/05 20:28:29 $ $NHDT-Branch: NetHack-3.7 $
|
# NetHack 3.7 multiw-2.500 $NHDT-Date: 1599337709 2020/09/05 20:28:29 $ $NHDT-Branch: NetHack-3.7 $
|
||||||
#
|
#
|
||||||
# Sorts out support for multiple window ports (interfaces) to included in the build.
|
# Sorts out support for multiple window ports (interfaces) to included in the build.
|
||||||
#
|
#
|
||||||
# Included from:
|
# Included from:
|
||||||
# hints/linux.370
|
# hints/linux.500
|
||||||
# hints/macOS.370
|
# hints/macOS.500
|
||||||
#
|
#
|
||||||
# The following will be set appropriately following this:
|
# The following will be set appropriately following this:
|
||||||
# - WANT_WIN_XXX (at least one will be set; default is TTY)
|
# - WANT_WIN_XXX (at least one will be set; default is TTY)
|
||||||
@@ -217,6 +217,6 @@ ifeq "$(NOCRASHREPORT)" "1"
|
|||||||
WINCFLAGS += -DNOCRASHREPORT
|
WINCFLAGS += -DNOCRASHREPORT
|
||||||
endif
|
endif
|
||||||
|
|
||||||
#end of hints/include/multiw-2.370
|
#end of hints/include/multiw-2.500
|
||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
|
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
# NetHack 3.7 response.370 $NHDT-Date: 1668359835 2022/11/13 17:17:15 $ $NHDT-Branch: NetHack-3.7 $
|
# NetHack 3.7 response.500 $NHDT-Date: 1668359835 2022/11/13 17:17:15 $ $NHDT-Branch: NetHack-3.7 $
|
||||||
|
|
||||||
ifeq "$(RESP)" "1"
|
ifeq "$(RESP)" "1"
|
||||||
USE_RESPONSEFILE=1
|
USE_RESPONSEFILE=1
|
||||||
@@ -29,5 +29,5 @@ CLEAN_CC_RESPONSEFILE=rm -f $(CC_RESPONSEFILE);
|
|||||||
CLEAN_CXX_RESPONSEFILE=rm -f $(CXX_RESPONSEFILE);
|
CLEAN_CXX_RESPONSEFILE=rm -f $(CXX_RESPONSEFILE);
|
||||||
endif
|
endif
|
||||||
|
|
||||||
#end of response.370
|
#end of response.500
|
||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
# NetHack 3.7 linux.370 $NHDT-Date: 1693519390 2023/08/31 22:03:10 $ $NHDT-Branch: keni-crashweb2 $:$NHDT-Revision: 1.61 $
|
# NetHack 3.7 linux.500 $NHDT-Date: 1693519390 2023/08/31 22:03:10 $ $NHDT-Branch: keni-crashweb2 $:$NHDT-Revision: 1.61 $
|
||||||
# Copyright (c) Kenneth Lorber, Kensington, Maryland, 2007.
|
# Copyright (c) Kenneth Lorber, Kensington, Maryland, 2007.
|
||||||
# NetHack may be freely redistributed. See license for details.
|
# NetHack may be freely redistributed. See license for details.
|
||||||
#
|
#
|
||||||
@@ -13,12 +13,12 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
#-PRE
|
#-PRE
|
||||||
# linux.370 hints file provides a single-user build for Linux (such
|
# linux.500 hints file provides a single-user build for Linux (such
|
||||||
# as Ubuntu focal).
|
# as Ubuntu focal).
|
||||||
|
|
||||||
# note: '#-INCLUDE' is not just a comment
|
# note: '#-INCLUDE' is not just a comment
|
||||||
# multiw-1.370 contains sections 1 to 2
|
# multiw-1.500 contains sections 1 to 2
|
||||||
#-INCLUDE multiw-1.370
|
#-INCLUDE multiw-1.500
|
||||||
|
|
||||||
HINTSVERSION := 370
|
HINTSVERSION := 370
|
||||||
|
|
||||||
@@ -52,7 +52,7 @@ USE_NOSTATICFN = 1
|
|||||||
#USE_NONOSTATICFN = 1
|
#USE_NONOSTATICFN = 1
|
||||||
|
|
||||||
#-----------------------------------------------------------------------------
|
#-----------------------------------------------------------------------------
|
||||||
#-INCLUDE cross-pre1.370
|
#-INCLUDE cross-pre1.500
|
||||||
|
|
||||||
|
|
||||||
#-----------------------------------------------------------------------------
|
#-----------------------------------------------------------------------------
|
||||||
@@ -60,12 +60,12 @@ USE_NOSTATICFN = 1
|
|||||||
# you're reading this in Makefile augmented by hints, that may not be true).
|
# you're reading this in Makefile augmented by hints, that may not be true).
|
||||||
#
|
#
|
||||||
|
|
||||||
#-INCLUDE multiw-2.370
|
#-INCLUDE multiw-2.500
|
||||||
|
|
||||||
# compiler.370 contains compiler detection and adjustments common
|
# compiler.500 contains compiler detection and adjustments common
|
||||||
# to both linux and macOS
|
# to both linux and macOS
|
||||||
|
|
||||||
#-INCLUDE compiler.370
|
#-INCLUDE compiler.500
|
||||||
|
|
||||||
ifdef WANT_WIN_QT
|
ifdef WANT_WIN_QT
|
||||||
ifdef WANT_WIN_QT5
|
ifdef WANT_WIN_QT5
|
||||||
@@ -80,10 +80,10 @@ endif # g++ greater than or equal to 14
|
|||||||
endif # WANT_WIN_QT6
|
endif # WANT_WIN_QT6
|
||||||
endif # WANT_WIN_QT
|
endif # WANT_WIN_QT
|
||||||
|
|
||||||
# misc.370 must come after compiler.370
|
# misc.500 must come after compiler.500
|
||||||
# and after QTDIR is defined.
|
# and after QTDIR is defined.
|
||||||
#
|
#
|
||||||
#-INCLUDE misc.370
|
#-INCLUDE misc.500
|
||||||
|
|
||||||
ifeq "$(USE_ASAN)" "1"
|
ifeq "$(USE_ASAN)" "1"
|
||||||
CFLAGS+=-fsanitize=address
|
CFLAGS+=-fsanitize=address
|
||||||
@@ -189,7 +189,7 @@ endif #HAVE_NCURSESW
|
|||||||
endif #WANT_WIN_CURSES
|
endif #WANT_WIN_CURSES
|
||||||
|
|
||||||
#
|
#
|
||||||
#-INCLUDE multisnd1-pre.370
|
#-INCLUDE multisnd1-pre.500
|
||||||
#
|
#
|
||||||
|
|
||||||
ifeq "$(CCISCLANG)" "1"
|
ifeq "$(CCISCLANG)" "1"
|
||||||
@@ -201,15 +201,15 @@ LIBCFLAGS+=-DSIG_RET_TYPE=__sighandler_t
|
|||||||
# gcc-specific ends
|
# gcc-specific ends
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# WINCFLAGS set from multiw-2.370
|
# WINCFLAGS set from multiw-2.500
|
||||||
# SNDCFLAGS set from multisnd-pre.370
|
# SNDCFLAGS set from multisnd-pre.500
|
||||||
CFLAGS+= $(WINCFLAGS)
|
CFLAGS+= $(WINCFLAGS)
|
||||||
CFLAGS+= $(SNDCFLAGS)
|
CFLAGS+= $(SNDCFLAGS)
|
||||||
CFLAGS+= $(NHCFLAGS)
|
CFLAGS+= $(NHCFLAGS)
|
||||||
CFLAGS+= $(LIBCFLAGS)
|
CFLAGS+= $(LIBCFLAGS)
|
||||||
|
|
||||||
# WINCFLAGS set from multiw-2.370
|
# WINCFLAGS set from multiw-2.500
|
||||||
# SNDCFLAGS set from multisnd-pre.370
|
# SNDCFLAGS set from multisnd-pre.500
|
||||||
CCXXFLAGS+= $(WINCFLAGS)
|
CCXXFLAGS+= $(WINCFLAGS)
|
||||||
CCXXFLAGS+= $(SNDCFLAGS)
|
CCXXFLAGS+= $(SNDCFLAGS)
|
||||||
CCXXFLAGS+= $(NHCFLAGS)
|
CCXXFLAGS+= $(NHCFLAGS)
|
||||||
@@ -443,28 +443,28 @@ CHGRP=true
|
|||||||
# manpages directory
|
# manpages directory
|
||||||
MANDIR=/usr/share/man/man6
|
MANDIR=/usr/share/man/man6
|
||||||
#
|
#
|
||||||
#-INCLUDE cross-pre2.370
|
#-INCLUDE cross-pre2.500
|
||||||
#
|
#
|
||||||
|
|
||||||
#
|
#
|
||||||
#-INCLUDE gbdates-pre.370
|
#-INCLUDE gbdates-pre.500
|
||||||
#
|
#
|
||||||
|
|
||||||
#
|
#
|
||||||
#-INCLUDE multisnd2-pre.370
|
#-INCLUDE multisnd2-pre.500
|
||||||
#
|
#
|
||||||
|
|
||||||
#
|
#
|
||||||
#-INCLUDE response.370
|
#-INCLUDE response.500
|
||||||
#
|
#
|
||||||
|
|
||||||
#-POST
|
#-POST
|
||||||
|
|
||||||
#
|
#
|
||||||
#-INCLUDE gbdates-post.370
|
#-INCLUDE gbdates-post.500
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
#-INCLUDE multisnd-post.370
|
#-INCLUDE multisnd-post.500
|
||||||
#
|
#
|
||||||
|
|
||||||
ifdef MAKEFILE_TOP
|
ifdef MAKEFILE_TOP
|
||||||
@@ -488,6 +488,6 @@ $(TARGETPFX)libnhmain.o : ../sys/libnh/libnhmain.c $(HACK_H)
|
|||||||
endif # WANT_LIBNH
|
endif # WANT_LIBNH
|
||||||
|
|
||||||
#
|
#
|
||||||
#-INCLUDE cross-post.370
|
#-INCLUDE cross-post.500
|
||||||
#
|
#
|
||||||
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
# NetHack 3.7 macOS.370 $NHDT-Date: 1693359574 2023/08/30 01:39:34 $ $NHDT-Branch: keni-crashweb2 $:$NHDT-Revision: 1.138 $
|
# NetHack 3.7 macOS.500 $NHDT-Date: 1693359574 2023/08/30 01:39:34 $ $NHDT-Branch: keni-crashweb2 $:$NHDT-Revision: 1.138 $
|
||||||
# Copyright (c) Kenneth Lorber, Kensington, Maryland, 2015.
|
# Copyright (c) Kenneth Lorber, Kensington, Maryland, 2015.
|
||||||
# NetHack may be freely redistributed. See license for details.
|
# NetHack may be freely redistributed. See license for details.
|
||||||
#
|
#
|
||||||
@@ -18,7 +18,7 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
# note: '#-INCLUDE' is not just a comment; multiw-1 contains sections 1 to 2
|
# note: '#-INCLUDE' is not just a comment; multiw-1 contains sections 1 to 2
|
||||||
#-INCLUDE multiw-1.370
|
#-INCLUDE multiw-1.500
|
||||||
|
|
||||||
HINTSVERSION := 370
|
HINTSVERSION := 370
|
||||||
|
|
||||||
@@ -55,14 +55,14 @@ endif
|
|||||||
# you're reading this in Makefile augmented by hints, that may not be true).
|
# you're reading this in Makefile augmented by hints, that may not be true).
|
||||||
#
|
#
|
||||||
|
|
||||||
#-INCLUDE cross-pre1.370
|
#-INCLUDE cross-pre1.500
|
||||||
|
|
||||||
#-INCLUDE multiw-2.370
|
#-INCLUDE multiw-2.500
|
||||||
|
|
||||||
# compiler.370 contains compiler detection and adjustments common
|
# compiler.500 contains compiler detection and adjustments common
|
||||||
# to both linux and macOS
|
# to both linux and macOS
|
||||||
|
|
||||||
#-INCLUDE compiler.370
|
#-INCLUDE compiler.500
|
||||||
|
|
||||||
ifdef WANT_WIN_QT
|
ifdef WANT_WIN_QT
|
||||||
ifeq "$(HAVE_HOMEBREW)" "1"
|
ifeq "$(HAVE_HOMEBREW)" "1"
|
||||||
@@ -94,10 +94,10 @@ CCXXFLAGS +=-Wno-c++20-attribute-extensions
|
|||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# misc.370 must come after compiler.370
|
# misc.500 must come after compiler.500
|
||||||
# and after QTDIR is defined
|
# and after QTDIR is defined
|
||||||
|
|
||||||
#-INCLUDE misc.370
|
#-INCLUDE misc.500
|
||||||
|
|
||||||
# manpages directory
|
# manpages directory
|
||||||
MANDIR=/usr/local/share/man/man6
|
MANDIR=/usr/local/share/man/man6
|
||||||
@@ -223,11 +223,11 @@ endif
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
#
|
#
|
||||||
#-INCLUDE multisnd1-pre.370
|
#-INCLUDE multisnd1-pre.500
|
||||||
#
|
#
|
||||||
|
|
||||||
# although not currently doing anything for macOS, this is
|
# although not currently doing anything for macOS, this is
|
||||||
# kept in for consistency with layout of linux.370
|
# kept in for consistency with layout of linux.500
|
||||||
ifeq "$(CCISCLANG)" "1"
|
ifeq "$(CCISCLANG)" "1"
|
||||||
# clang-specific starts
|
# clang-specific starts
|
||||||
# clang-specific ends
|
# clang-specific ends
|
||||||
@@ -237,15 +237,15 @@ else
|
|||||||
# gcc-specific ends
|
# gcc-specific ends
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# WINCFLAGS set from multiw-2.370
|
# WINCFLAGS set from multiw-2.500
|
||||||
# SNDCFLAGS set from multisnd-pre.370
|
# SNDCFLAGS set from multisnd-pre.500
|
||||||
CFLAGS+= $(PKGCFLAGS) $(WINCFLAGS)
|
CFLAGS+= $(PKGCFLAGS) $(WINCFLAGS)
|
||||||
CFLAGS+= $(SNDCFLAGS)
|
CFLAGS+= $(SNDCFLAGS)
|
||||||
CFLAGS+= $(NHCFLAGS)
|
CFLAGS+= $(NHCFLAGS)
|
||||||
CFLAGS+= $(LIBCFLAGS)
|
CFLAGS+= $(LIBCFLAGS)
|
||||||
|
|
||||||
# WINCFLAGS set from multiw-2.370
|
# WINCFLAGS set from multiw-2.500
|
||||||
# SNDCFLAGS set from multisnd-pre.370
|
# SNDCFLAGS set from multisnd-pre.500
|
||||||
CCXXFLAGS+= $(WINCFLAGS)
|
CCXXFLAGS+= $(WINCFLAGS)
|
||||||
CCXXFLAGS+= $(SNDCFLAGS)
|
CCXXFLAGS+= $(SNDCFLAGS)
|
||||||
CCXXFLAGS+= $(NHCFLAGS)
|
CCXXFLAGS+= $(NHCFLAGS)
|
||||||
@@ -460,16 +460,16 @@ SYSCONFENSURE = (if ! test -f $(INSTDIR)/sysconf ; then \
|
|||||||
# Install.Qt mentions a patch for macos - it's not there (it seems to be in the Qt binary
|
# Install.Qt mentions a patch for macos - it's not there (it seems to be in the Qt binary
|
||||||
# package under the docs directory).
|
# package under the docs directory).
|
||||||
#
|
#
|
||||||
#-INCLUDE cross-pre2.370
|
#-INCLUDE cross-pre2.500
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
#-INCLUDE gbdates-pre.370
|
#-INCLUDE gbdates-pre.500
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
#-INCLUDE multisnd2-pre.370
|
#-INCLUDE multisnd2-pre.500
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
#-INCLUDE response.370
|
#-INCLUDE response.500
|
||||||
#
|
#
|
||||||
|
|
||||||
ifdef MAKEFILE_TOP
|
ifdef MAKEFILE_TOP
|
||||||
@@ -539,10 +539,10 @@ endif # MAKEFILE_SRC
|
|||||||
#-POST
|
#-POST
|
||||||
|
|
||||||
#
|
#
|
||||||
#-INCLUDE gbdates-post.370
|
#-INCLUDE gbdates-post.500
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
#-INCLUDE multisnd-post.370
|
#-INCLUDE multisnd-post.500
|
||||||
#
|
#
|
||||||
|
|
||||||
ifdef MAKEFILE_TOP
|
ifdef MAKEFILE_TOP
|
||||||
@@ -702,7 +702,7 @@ endif # WANT_BUNDLE
|
|||||||
# --- end of bundle ---
|
# --- end of bundle ---
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
#-INCLUDE cross-post.370
|
#-INCLUDE cross-post.500
|
||||||
#
|
#
|
||||||
|
|
||||||
ifdef MAKEFILE_TOP
|
ifdef MAKEFILE_TOP
|
||||||
Reference in New Issue
Block a user