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

a build fix, due to compile issue for pdcursesmod

Browse Source 
GCC15 switched its default to -std=gnu23 and there's a bug in
pdcursesmod as a result. That impacts MSYS2/Mingw64 NetHack builds.
See: https://github.com/Bill-Gray/PDCursesMod/issues/333

The suggestion there is to force --std=gnu17 as a workaround.
This commit is contained in:
nhmall
2025-06-02 10:32:36 -04:00
parent afafc69eed
commit a9c0cd624f
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/.gitignore
+1
View File
@@ -31,3 +31,4 @@ bundle/*
GNUmakefile GNUmakefile
GNUmakefile.depend GNUmakefile.depend
.*.c .*.c
.depend
sys/windows/GNUmakefile
+11 -5
View File
@@ -301,9 +301,11 @@ USE_DLB = Y
ifdef CI_COMPILER ifdef CI_COMPILER
cc = gcc -c cc = gcc -c
cxx = g++ -c
ld = gcc ld = gcc
else else
cc = gcc -c cc = gcc -c
cxx = g++ -c
ld = gcc ld = gcc
endif endif
ifeq "$(MSYSTEM)" "MINGW32" ifeq "$(MSYSTEM)" "MINGW32"
@@ -552,6 +554,10 @@ CLEAN_FILE += $(RTARGETS) $(ROBJS)
# PDCurses # PDCurses
#========================================== #==========================================
ifeq "$(ADD_CURSES)" "Y" ifeq "$(ADD_CURSES)" "Y"
#https://github.com/Bill-Gray/PDCursesMod/issues/333
PDCMOD_WORKAROUND = -std=gnu17
PDCCOMMONSRC = addch addchstr addstr attr beep bkgd border clear \ PDCCOMMONSRC = addch addchstr addstr attr beep bkgd border clear \
color debug delch deleteln getch getstr getyx inch \ color debug delch deleteln getch getstr getyx inch \
inchstr initscr inopts insch insstr kernel keyname \ inchstr initscr inopts insch insstr kernel keyname \
@@ -574,10 +580,10 @@ $(PDCLIB): $(PDCOBJS)
ar rcs $@ $^ ar rcs $@ $^
$(OP)/%.o: $(PDCSRC)/%.c | $(OP) $(OP)/%.o: $(PDCSRC)/%.c | $(OP)
$(cc) $(CFLAGS) $(PDCURSESFLAGS) $(PDCINCL) -D_LIB $< -o$@ $(cc) $(CFLAGS) $(PDCMOD_WORKAROUND) $(PDCURSESFLAGS) $(PDCINCL) -D_LIB $< -o$@
$(OP)/%.o: $(PDCWINCON)/%.c | $(OP) $(OP)/%.o: $(PDCWINCON)/%.c | $(OP)
$(cc) $(CFLAGS) $(PDCURSESFLAGS) $(PDCINCL) -I$(PDCWINCON) -D_LIB $< -o$@ $(cc) $(CFLAGS) $(PDCMOD_WORKAROUND) $(PDCURSESFLAGS) $(PDCINCL) -I$(PDCWINCON) -D_LIB $< -o$@
$(OP): $(OP):
@mkdir -p $@ @mkdir -p $@
@@ -599,10 +605,10 @@ $(PDCWLIB): $(PDCWOBJS)
ar rcs $@ $^ ar rcs $@ $^
$(OPW)/%.o: $(PDCSRC)/%.c | $(OPW) $(OPW)/%.o: $(PDCSRC)/%.c | $(OPW)
$(cc) $(CFLAGS) $(PDCURSESFLAGS) $(PDCINCL) -D_LIB $< -o$@ $(cc) $(CFLAGS) $(PDCMOD_WORKAROUND) $(PDCURSESFLAGS) $(PDCINCL) -D_LIB $< -o$@
$(OPW)/%.o: $(PDCWINGUI)/%.c | $(OPW) $(OPW)/%.o: $(PDCWINGUI)/%.c | $(OPW)
$(cc) $(CFLAGS) $(PDCURSESFLAGS) $(PDCINCL) -I$(PDCWINGUI) -D_LIB $< -o$@ $(cc) $(CFLAGS) $(PDCMOD_WORKAROUND) $(PDCURSESFLAGS) $(PDCINCL) -I$(PDCWINGUI) -D_LIB $< -o$@
$(OPW): $(OPW):
@mkdir -p $@ @mkdir -p $@
@@ -844,7 +850,7 @@ else # GIT_AVAILABLE no
CURLLUASRC=http://www.lua.org/ftp/lua-5.4.6.tar.gz CURLLUASRC=http://www.lua.org/ftp/lua-5.4.6.tar.gz
CURLLUADST=lua-5.4.6.tar.gz CURLLUADST=lua-5.4.6.tar.gz
CURLPDCSRC=https://github.com/Bill-Gray/PDCursesMod/archive/refs/tags/v4.4.0.zip CURLPDCSRC=https://github.com/Bill-Gray/PDCursesMod/archive/refs/tags/v4.5.1.zip
CURLPDCDST=$(PDCURSES).zip CURLPDCDST=$(PDCURSES).zip
fetchlua: fetchlua: