diff --git a/data/Vortex86MX-eng/Makefile b/data/Vortex86MX-eng/Makefile index 6208558ff2..c08288540c 100644 --- a/data/Vortex86MX-eng/Makefile +++ b/data/Vortex86MX-eng/Makefile @@ -494,7 +494,7 @@ AC97DIR=$(PROGS)/media/ac97snd media/ac97snd: .obj.ac97snd/ac97snd.exe $(msvc_final) .obj.ac97snd/ac97snd.exe: .obj.ac97snd/ac97wav.obj .obj.ac97snd/crt.obj .obj.ac97snd/k_lib.obj \ - .obj.ac97snd/mpg.lib .sdk/sound.lib $(AC97DIR)/ufmod.obj + .obj.ac97snd/mpg.lib .sdk/sound.lib .obj.ac97snd/ufmod.obj $(msvc_link) .obj.ac97snd/ac97wav.obj: $(AC97DIR)/ac97snd/ac97wav.c \ $(AC97DIR)/kolibri.h $(AC97DIR)/ac97snd/ac97wav.h $(AC97DIR)/mpg/mpg123.h \ @@ -504,6 +504,12 @@ media/ac97snd: .obj.ac97snd/ac97snd.exe $(msvc_compile) .obj.ac97snd/k_lib.obj: $(AC97DIR)/ac97snd/k_lib.asm $(AC97DIR)/ac97snd/proc32.inc | .obj.ac97snd fasm $< $@ +.obj.ac97snd/ufmod.obj: $(AC97DIR)/ufmod-config.asm | .obj.ac97snd + fasm $< $@ -s .deps/ac97snd-ufmod.fas + prepsrc .deps/ac97snd-ufmod.fas /dev/stdout | \ + perl -n -e 's|\\|/|g;s| |\\ |g;push @a,$$1 if/^;include\\ \x27(.*?)\x27/;' \ + -e 'END{$$a=join " \\\n ",@a;print "$@: $$a\n$$a:\n"}' > .deps/ac97snd-ufmod.Po +-include .deps/ac97snd-ufmod.Po AC97SND_MPG_C_FILES:=$(wildcard $(AC97DIR)/mpg/*.c) AC97SND_MPG_H_FILES:=$(wildcard $(AC97DIR)/mpg/*.h) AC97SND_MPG_C_OBJECTS:=$(patsubst $(AC97DIR)/mpg/%.c,.obj.ac97snd/%.o,$(AC97SND_MPG_C_FILES)) diff --git a/data/eng/Makefile b/data/eng/Makefile index fd60971959..a6c52d6eb1 100644 --- a/data/eng/Makefile +++ b/data/eng/Makefile @@ -506,7 +506,7 @@ AC97DIR=$(PROGS)/media/ac97snd media/ac97snd: .obj.ac97snd/ac97snd.exe $(msvc_final) .obj.ac97snd/ac97snd.exe: .obj.ac97snd/ac97wav.obj .obj.ac97snd/crt.obj .obj.ac97snd/k_lib.obj \ - .obj.ac97snd/mpg.lib .sdk/sound.lib $(AC97DIR)/ufmod.obj + .obj.ac97snd/mpg.lib .sdk/sound.lib .obj.ac97snd/ufmod.obj $(msvc_link) .obj.ac97snd/ac97wav.obj: $(AC97DIR)/ac97snd/ac97wav.c \ $(AC97DIR)/kolibri.h $(AC97DIR)/ac97snd/ac97wav.h $(AC97DIR)/mpg/mpg123.h \ @@ -516,6 +516,12 @@ media/ac97snd: .obj.ac97snd/ac97snd.exe $(msvc_compile) .obj.ac97snd/k_lib.obj: $(AC97DIR)/ac97snd/k_lib.asm $(AC97DIR)/ac97snd/proc32.inc | .obj.ac97snd fasm $< $@ +.obj.ac97snd/ufmod.obj: $(AC97DIR)/ufmod-config.asm | .obj.ac97snd + fasm $< $@ -s .deps/ac97snd-ufmod.fas + prepsrc .deps/ac97snd-ufmod.fas /dev/stdout | \ + perl -n -e 's|\\|/|g;s| |\\ |g;push @a,$$1 if/^;include\\ \x27(.*?)\x27/;' \ + -e 'END{$$a=join " \\\n ",@a;print "$@: $$a\n$$a:\n"}' > .deps/ac97snd-ufmod.Po +-include .deps/ac97snd-ufmod.Po AC97SND_MPG_C_FILES:=$(wildcard $(AC97DIR)/mpg/*.c) AC97SND_MPG_H_FILES:=$(wildcard $(AC97DIR)/mpg/*.h) AC97SND_MPG_C_OBJECTS:=$(patsubst $(AC97DIR)/mpg/%.c,.obj.ac97snd/%.o,$(AC97SND_MPG_C_FILES)) diff --git a/data/new-stack/Makefile b/data/new-stack/Makefile index 024012c74f..67f45826bc 100644 --- a/data/new-stack/Makefile +++ b/data/new-stack/Makefile @@ -336,7 +336,7 @@ AC97DIR=$(PROGS)/media/ac97snd media/ac97snd: .obj.ac97snd/ac97snd.exe $(msvc_final) .obj.ac97snd/ac97snd.exe: .obj.ac97snd/ac97wav.obj .obj.ac97snd/crt.obj .obj.ac97snd/k_lib.obj \ - .obj.ac97snd/mpg.lib .sdk/sound.lib $(AC97DIR)/ufmod.obj + .obj.ac97snd/mpg.lib .sdk/sound.lib .obj.ac97snd/ufmod.obj $(msvc_link) .obj.ac97snd/ac97wav.obj: $(AC97DIR)/ac97snd/ac97wav.c \ $(AC97DIR)/kolibri.h $(AC97DIR)/ac97snd/ac97wav.h $(AC97DIR)/mpg/mpg123.h \ @@ -346,6 +346,12 @@ media/ac97snd: .obj.ac97snd/ac97snd.exe $(msvc_compile) .obj.ac97snd/k_lib.obj: $(AC97DIR)/ac97snd/k_lib.asm $(AC97DIR)/ac97snd/proc32.inc | .obj.ac97snd fasm $< $@ +.obj.ac97snd/ufmod.obj: $(AC97DIR)/ufmod-config.asm | .obj.ac97snd + fasm $< $@ -s .deps/ac97snd-ufmod.fas + prepsrc .deps/ac97snd-ufmod.fas /dev/stdout | \ + perl -n -e 's|\\|/|g;s| |\\ |g;push @a,$$1 if/^;include\\ \x27(.*?)\x27/;' \ + -e 'END{$$a=join " \\\n ",@a;print "$@: $$a\n$$a:\n"}' > .deps/ac97snd-ufmod.Po +-include .deps/ac97snd-ufmod.Po AC97SND_MPG_C_FILES:=$(wildcard $(AC97DIR)/mpg/*.c) AC97SND_MPG_H_FILES:=$(wildcard $(AC97DIR)/mpg/*.h) AC97SND_MPG_C_OBJECTS:=$(patsubst $(AC97DIR)/mpg/%.c,.obj.ac97snd/%.o,$(AC97SND_MPG_C_FILES)) diff --git a/data/rus/Makefile b/data/rus/Makefile index 53f3850e68..9220c6e5f6 100644 --- a/data/rus/Makefile +++ b/data/rus/Makefile @@ -499,7 +499,7 @@ AC97DIR=$(PROGS)/media/ac97snd media/ac97snd: .obj.ac97snd/ac97snd.exe $(msvc_final) .obj.ac97snd/ac97snd.exe: .obj.ac97snd/ac97wav.obj .obj.ac97snd/crt.obj .obj.ac97snd/k_lib.obj \ - .obj.ac97snd/mpg.lib .sdk/sound.lib $(AC97DIR)/ufmod.obj + .obj.ac97snd/mpg.lib .sdk/sound.lib .obj.ac97snd/ufmod.obj $(msvc_link) .obj.ac97snd/ac97wav.obj: $(AC97DIR)/ac97snd/ac97wav.c \ $(AC97DIR)/kolibri.h $(AC97DIR)/ac97snd/ac97wav.h $(AC97DIR)/mpg/mpg123.h \ @@ -509,6 +509,12 @@ media/ac97snd: .obj.ac97snd/ac97snd.exe $(msvc_compile) .obj.ac97snd/k_lib.obj: $(AC97DIR)/ac97snd/k_lib.asm $(AC97DIR)/ac97snd/proc32.inc | .obj.ac97snd fasm $< $@ +.obj.ac97snd/ufmod.obj: $(AC97DIR)/ufmod-config.asm | .obj.ac97snd + fasm $< $@ -s .deps/ac97snd-ufmod.fas + prepsrc .deps/ac97snd-ufmod.fas /dev/stdout | \ + perl -n -e 's|\\|/|g;s| |\\ |g;push @a,$$1 if/^;include\\ \x27(.*?)\x27/;' \ + -e 'END{$$a=join " \\\n ",@a;print "$@: $$a\n$$a:\n"}' > .deps/ac97snd-ufmod.Po +-include .deps/ac97snd-ufmod.Po AC97SND_MPG_C_FILES:=$(wildcard $(AC97DIR)/mpg/*.c) AC97SND_MPG_H_FILES:=$(wildcard $(AC97DIR)/mpg/*.h) AC97SND_MPG_C_OBJECTS:=$(patsubst $(AC97DIR)/mpg/%.c,.obj.ac97snd/%.o,$(AC97SND_MPG_C_FILES)) diff --git a/programs/media/ac97snd/ufmod-config.asm b/programs/media/ac97snd/ufmod-config.asm new file mode 100644 index 0000000000..c7bf767e66 --- /dev/null +++ b/programs/media/ac97snd/ufmod-config.asm @@ -0,0 +1,7 @@ +UF_FREQ equ 48000 ; not used actually +UF_RAMP equ STRONG +UF_MODE equ AC97SND ; important +DEBUG equ 0 +NOLINKER equ 0 +include '../../develop/libraries/ufmod/eff.inc' +include '../../develop/libraries/ufmod/fasm.asm' diff --git a/programs/media/ac97snd/ufmod.obj b/programs/media/ac97snd/ufmod.obj deleted file mode 100644 index 1116721662..0000000000 Binary files a/programs/media/ac97snd/ufmod.obj and /dev/null differ