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

work around a conflict with visual studio build

Browse Source
This commit is contained in:
nhmall
2024-04-15 12:45:49 -04:00
parent 2ce6df8be5
commit 7e6dab38c5
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sys/windows/Makefile.mingw32
View File

@@ -1083,7 +1083,7 @@ $(ONHW)/%.o: $(WCURSES)/%.c $(NHLUAH) | $(ONHW)
$(NHWRES): $(MSWIN)/NetHackW.rc $(MSWIN)/NetHackW.exe.manifest \
$(BMPS) $(WAV) $(MSWIN)/NetHack.ico | $(ONHW)
$(rc) --include-dir=$(MSWIN) $(RCFLAGS) --input=$< -o$@
$(rc) --include-dir=$(MSWIN) $(RCFLAGS) -DVIA_MAKE --input=$< -o$@
$(MSWIN)/tiles.bmp: $(U)tile2bmp.exe $(TILEFILES)
$< $@

2
sys/windows/Makefile.nmake
View File

@@ -1558,7 +1558,7 @@ $(OGUI)NetHackW.res: $(SRC)\tiles.bmp $(MSWIN)\NetHackW.rc $(MSWIN)\NetHack.ico
$(MSWIN)\petmark.bmp $(MSWIN)\pilemark.bmp $(MSWIN)\NetHack.ico \
$(MSWIN)\rip.bmp $(MSWIN)\splash.bmp $(MSWIN)\NetHackW.exe.manifest $(WAV)
@echo Building resource file $@ from $**
$(rc) -nologo -r -fo$@ -i$(MSWIN) -i$(SndWavDir) -dNDEBUG $(RCFLAGS) $(MSWIN)\NetHackW.rc
$(rc) -nologo -r -fo$@ -i$(MSWIN) -i$(SndWavDir) -dNDEBUG -dVIA_MAKE $(RCFLAGS) $(MSWIN)\NetHackW.rc
$(OTTY)console.res: $(MSWSYS)\console.rc $(MSWSYS)\NetHack.ico $(WAV)
@echo Building resource file $@ from $**

2
win/win32/NetHackW.rc
View File

@@ -455,12 +455,14 @@ sa2_xpleveldown WAVE "sa2_xpleveldown.wav"
sa2_xplevelup WAVE "sa2_xplevelup.wav"
#endif
#ifdef VIA_MAKE
#ifndef ID_MANIFEST
#define ID_MANIFEST 1
#endif
#ifndef RT_MANIFEST
#define RT_MANIFEST MAKEINTRESOURCE(24)
#endif
#endif
ID_MANIFEST RT_MANIFEST "NetHackW.exe.manifest"