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

remove a workaround in Makefile.mingw32

Browse Source
This commit is contained in:
nhmall
2022-02-04 23:07:22 -05:00
parent e795dd107e
commit 2e3e53883f
1 changed files with 0 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
sys/windows/Makefile.mingw32
View File

@@ -250,15 +250,9 @@ USE_DLB = Y
ifdef CI_COMPILER ifdef CI_COMPILER
cc = gcc -c cc = gcc -c
ld = gcc ld = gcc
# the mingw version on our CI is missing
# winres.h. This will cause the Makefile.mingw32
# to put a temporary copy into one of our folders
# that windres is already looking in.
MISSING_HEADER = Y
else else
cc = gcc -c cc = gcc -c
ld = gcc ld = gcc
MISSING_HEADER = N
endif endif
ifeq "$(MSYSTEM)" "MINGW32" ifeq "$(MSYSTEM)" "MINGW32"
rc = windres --target=pe-i386 rc = windres --target=pe-i386
@@ -829,22 +823,7 @@ $(ONH)/%.o: $(WCURSES)/%.c $(NHLUAH) | $(ONH)
$(cc) $(CFLAGSNH) $(PDCINCL) $< -o$@ $(cc) $(CFLAGSNH) $(PDCINCL) $< -o$@
$(NHRES): $(MSWIN)/NetHack.rc $(MSWIN)/NetHack.ico | $(ONH) $(NHRES): $(MSWIN)/NetHack.rc $(MSWIN)/NetHack.ico | $(ONH)
ifeq "$(MISSING_HEADER)" "Y"
echo '/**' > $(MSWIN)/winres.h
echo ' * This file has no copyright assigned and is placed in the Public Domain.' >> $(MSWIN)/winres.h
echo ' * This file is part of the mingw-w64 runtime package.' >> $(MSWIN)/winres.h
echo ' * No warranty is given; refer to the file DISCLAIMER.PD within this package.' >> $(MSWIN)/winres.h
echo ' */' >> $(MSWIN)/winres.h
echo '#include <winresrc.h>' >> $(MSWIN)/winres.h
echo '#ifdef IDC_STATIC' >> $(MSWIN)/winres.h
echo '#undef IDC_STATIC' >> $(MSWIN)/winres.h
echo '#endif' >> $(MSWIN)/winres.h
echo '#define IDC_STATIC (-1)' >> $(MSWIN)/winres.h
endif
$(rc) --include-dir=$(MSWIN) --input=$< -o$@ $(rc) --include-dir=$(MSWIN) --input=$< -o$@
ifeq "$(MISSING_HEADER)" "Y"
@-rm -f $(MSWIN)/winres.h
endif
$(ONH): $(ONH):
@mkdir -p $@ @mkdir -p $@