From: Eric Branlund Date: Sun, 10 Jul 2022 18:25:18 +0000 (-0600) Subject: Merge branch 'fix-sounds-make-distcheck' into macos-develop X-Git-Tag: vmacos3.0.0-alpha67~1^2~30 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0bb57f070a0ac741988e8f591b8ee4afa24d8d44;p=hengbandforosx%2Fhengbandosx.git Merge branch 'fix-sounds-make-distcheck' into macos-develop --- 0bb57f070a0ac741988e8f591b8ee4afa24d8d44 diff --cc lib/xtra/sound/Makefile.am index a9c782347,7105f4b50..364ddbff7 --- a/lib/xtra/sound/Makefile.am +++ b/lib/xtra/sound/Makefile.am @@@ -4,31 -4,4 +4,18 @@@ EXTRA_DIST = sound.cfg \ $(sound_files) - sound_files = \ - se_maoudamashii_voice_monster01.wav \ - apple1-r.wav \ - decision25r.wav \ - drop1.wav \ - enemy-advent1-r.wav \ - sea-lion2-r.wav \ - se_maoudamashii_battle07.wav \ - se_maoudamashii_retro22.wav \ - se_maoudamashii_se_drink01.wav \ - sword-clash1-r.wav \ - sword-gesture3-r.wav \ - sword-slash3-r.wav + sound_files = + +if COCOA +# APPNAME to APPRES duplicate what's in src/Makefile.am. It would be nice to +# avoid that, but until then, they should match. +APPNAME = $(PACKAGE_NAME) +APPDIR = $(APPNAME).app +APPBNDL = $(bindir)/$(APPDIR) +APPCONT = $(APPBNDL)/Contents +APPRES = $(APPCONT)/Resources + +appsounddir = $(APPRES)/lib/xtra/sound +appsound_DATA = \ + sound.cfg $(sound_files) +endif