From d08512f2e72be27e47fb3e67687adfc6a80a6c98 Mon Sep 17 00:00:00 2001 From: CleverMouse Date: Mon, 9 Apr 2012 12:05:32 +0000 Subject: [PATCH] fix compilation flags for uFMOD in ac97snd git-svn-id: svn://kolibrios.org@2593 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/Vortex86MX-eng/Makefile | 8 +++++++- data/eng/Makefile | 8 +++++++- data/new-stack/Makefile | 8 +++++++- data/rus/Makefile | 8 +++++++- programs/media/ac97snd/ufmod-config.asm | 7 +++++++ programs/media/ac97snd/ufmod.obj | Bin 8451 -> 0 bytes 6 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 programs/media/ac97snd/ufmod-config.asm delete mode 100644 programs/media/ac97snd/ufmod.obj 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 1116721662fe875feaf333481b475dbc7f0b8259..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8451 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