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

follow-up for today's sound interface changes

Browse Source
This commit is contained in:
nhmall
2023-01-22 16:44:48 -05:00
parent 949afe8e83
commit e9e62d7ad2
7 changed files with 252 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
sys/windows/Makefile.mingw32
View File

@@ -248,6 +248,7 @@ MSWIN =../win/win32
WCURSES =../win/curses
WSHR =../win/share
QT =../win/Qt
SNDWAVDIR =../sound/wav
#
# Object directory.
@@ -769,6 +770,26 @@ NHWOBJS = $(addprefix $(ONHW)/, $(COREOBJS) $(NHWONLY))
DATEW_O = $(addsuffix .o, $(addprefix $(ONHW)/, date))
TILEFILES = $(addprefix $(WSHR)/, monsters.txt objects.txt other.txt)
BMPS = $(addprefix $(MSWIN)/, $(addsuffix .bmp, mnsel mnselcnt mnunsel petmark pilemark rip splash tiles))
WAVLIST = se_squeak_A se_squeak_B se_squeak_B_flat se_squeak_C \
se_squeak_D se_squeak_D_flat se_squeak_E \
se_squeak_E_flat se_squeak_F se_squeak_F_sharp \
se_squeak_G se_squeak_G_sharp sound_Bell sound_Bugle_A \
sound_Bugle_B sound_Bugle_C sound_Bugle_D sound_Bugle_E \
sound_Bugle_F sound_Bugle_G sound_Drum_Of_Earthquake \
sound_Fire_Horn sound_Frost_Horn sound_Leather_Drum \
sound_Magic_Harp_A sound_Magic_Harp_B sound_Magic_Harp_C \
sound_Magic_Harp_D sound_Magic_Harp_E sound_Magic_Harp_F \
sound_Magic_Harp_G sound_Tooled_Horn_A sound_Tooled_Horn_B \
sound_Tooled_Horn_C sound_Tooled_Horn_D sound_Tooled_Horn_E \
sound_Tooled_Horn_F sound_Tooled_Horn_G sound_Wooden_Flute_A \
sound_Wooden_Flute_B sound_Wooden_Flute_C \
sound_Wooden_Flute_D sound_Wooden_Flute_E \
sound_Wooden_Flute_F sound_Wooden_Flute_G \
sound_Wooden_Harp_A sound_Wooden_Harp_B \
sound_Wooden_Harp_C sound_Wooden_Harp_D \
sound_Wooden_Harp_E sound_Wooden_Harp_F \
sound_Wooden_Harp_G
WAVS = $(addprefix $(SNDWAVDIR)/, $(addsuffix .wav, $(WAVLIST)))
NHWRES = $(ONHW)/winres.o
NHWTARGETS = $(GAMEDIR)/NetHackW.exe
@@ -809,8 +830,8 @@ $(ONHW)/%.o: $(MSWIN)/%.c $(NHLUAH) | $(ONHW)
$(ONHW)/%.o: $(WSHR)/%.c $(NHLUAH) | $(ONHW)
$(cc) $(CFLAGSW) $< -o$@
$(NHWRES): $(MSWIN)/NetHackW.rc $(BMPS) $(MSWIN)/NetHack.ico | $(ONHW)
$(rc) --include-dir=$(MSWIN) --input=$< -o$@
$(NHWRES): $(MSWIN)/NetHackW.rc $(BMPS) $(WAVS) $(MSWIN)/NetHack.ico | $(ONHW)
$(rc) --include-dir=$(MSWIN) --include-dir=$(SNDWAVDIR) --input=$< -o$@
$(MSWIN)/tiles.bmp: $(U)tile2bmp.exe $(TILEFILES)
$< $@
@@ -819,11 +840,15 @@ $(MSWIN)/%.bmp: $(U)uudecode.exe $(MSWIN)/%.uu
$^
mv $(notdir $@) $@
$(SNDWAVDIR)/%.wav: $(U)uudecode.exe $(SNDWAVDIR)/%.uu
$^
mv $(notdir $@) $@
$(ONHW):
@mkdir -p $@
CLEAN_DIR += $(ONHW)
CLEAN_FILE += $(NHWTARGETS) $(NHWOBJS) $(NHWRES) $(BMPS)
CLEAN_FILE += $(NHWTARGETS) $(NHWOBJS) $(NHWRES) $(BMPS) $(WAVS)
#==========================================
# nethack
@@ -846,7 +871,7 @@ NHTARGET = $(GAMEDIR)/NetHack.exe
nethack: $(NHTARGET)
$(GAMEDIR)/NetHack.exe: $(NHOBJS) $(NHRES) $(DATE_O) $(LUALIB) $(PDCLIB) | $(GAMEDIR)
$(GAMEDIR)/NetHack.exe: $(NHOBJS) $(WAVS) $(NHRES) $(DATE_O) $(LUALIB) $(PDCLIB) | $(GAMEDIR)
$(ld) $(LDFLAGS) -mconsole $^ $(LIBS) -static -lstdc++ -o$@
$(ONH)/%.o: $(SRC)/%.c $(NHLUAH) | $(ONH)
@@ -887,8 +912,8 @@ $(ONH)/%.o: $(TTY)/%.c $(NHLUAH) | $(ONH)
$(ONH)/%.o: $(WCURSES)/%.c $(NHLUAH) | $(ONH)
$(cc) $(CFLAGSNH) $(PDCINCL) $< -o$@
$(NHRES): $(MSWIN)/NetHack.rc $(MSWIN)/NetHack.ico | $(ONH)
$(rc) --include-dir=$(MSWIN) --input=$< -o$@
$(NHRES): $(MSWIN)/NetHack.rc $(WAVS) $(MSWIN)/NetHack.ico | $(ONH)
$(rc) --include-dir=$(MSWIN) --include-dir=$(SNDWAVDIR) --input=$< -o$@
$(ONH):
@mkdir -p $@