Commit 22558487 authored by Josh Coalson's avatar Josh Coalson
Browse files

change NASM file extensions from .s to .nasm

parent 9a7b5e2d
...@@ -46,7 +46,7 @@ $(PROGRAM) : $(OBJS) ...@@ -46,7 +46,7 @@ $(PROGRAM) : $(OBJS)
%.i : %.c %.i : %.c
$(CC) $(CFLAGS) -E $< -o $@ $(CC) $(CFLAGS) -E $< -o $@
%.o : %.s %.o : %.nasm
$(NASM) -f elf -d ELF -i i386/ $< -o $@ $(NASM) -f elf -d ELF -i i386/ $< -o $@
.PHONY : clean .PHONY : clean
......
...@@ -48,7 +48,7 @@ $(DYNAMIC_LIB) : $(OBJS) ...@@ -48,7 +48,7 @@ $(DYNAMIC_LIB) : $(OBJS)
%.i : %.c %.i : %.c
$(CC) $(CFLAGS) -E $< -o $@ $(CC) $(CFLAGS) -E $< -o $@
%.o : %.s %.o : %.nasm
$(NASM) -f elf -d ELF -i i386/ $< -o $@ $(NASM) -f elf -d ELF -i i386/ $< -o $@
.PHONY : clean .PHONY : clean
......
...@@ -45,23 +45,23 @@ C_FILES= \ ...@@ -45,23 +45,23 @@ C_FILES= \
stream_encoder_framing.c stream_encoder_framing.c
NASM_FILES= \ NASM_FILES= \
i386/cpu_asm.s \ i386/cpu_asm.nasm \
i386/fixed_asm.s \ i386/fixed_asm.nasm \
i386/lpc_asm.s i386/lpc_asm.nasm
OBJS= $(C_FILES:.c=.obj) $(NASM_FILES:.s=.obj) OBJS= $(C_FILES:.c=.obj) $(NASM_FILES:.nasm=.obj)
all: libFLAC.lib all: libFLAC.lib
libFLAC.lib: $(OBJS) libFLAC.lib: $(OBJS)
link.exe -lib -out:../../obj/lib/$*.lib $(OBJS) link.exe -lib -out:../../obj/lib/$*.lib $(OBJS)
i386/cpu_asm.obj: i386/cpu_asm.s i386/cpu_asm.obj: i386/cpu_asm.nasm
$(NASM) -f win32 -d WIN32 -i i386/ i386/cpu_asm.s -o i386/cpu_asm.obj $(NASM) -f win32 -d WIN32 -i i386/ i386/cpu_asm.nasm -o i386/cpu_asm.obj
i386/fixed_asm.obj: i386/fixed_asm.s i386/fixed_asm.obj: i386/fixed_asm.nasm
$(NASM) -f win32 -d WIN32 -i i386/ i386/fixed_asm.s -o i386/fixed_asm.obj $(NASM) -f win32 -d WIN32 -i i386/ i386/fixed_asm.nasm -o i386/fixed_asm.obj
i386/lpc_asm.obj: i386/lpc_asm.s i386/lpc_asm.obj: i386/lpc_asm.nasm
$(NASM) -f win32 -d WIN32 -i i386/ i386/lpc_asm.s -o i386/lpc_asm.obj $(NASM) -f win32 -d WIN32 -i i386/ i386/lpc_asm.nasm -o i386/lpc_asm.obj
clean: clean:
-del *.obj i386\*.obj *.pch -del *.obj i386\*.obj *.pch
......
...@@ -17,12 +17,12 @@ ...@@ -17,12 +17,12 @@
# Boston, MA 02111-1307, USA. # Boston, MA 02111-1307, USA.
# nasm build rule: # nasm build rule:
SUFFIXES = .s .lo SUFFIXES = .nasm .lo
.s.lo: .nasm.lo:
$(NASM) -f elf -d ELF $< -o $@ $(NASM) -f elf -d ELF $< -o $@
noinst_LTLIBRARIES = libFLAC-asm.la noinst_LTLIBRARIES = libFLAC-asm.la
libFLAC_asm_la_SOURCES = \ libFLAC_asm_la_SOURCES = \
cpu_asm.s \ cpu_asm.nasm \
fixed_asm.s \ fixed_asm.nasm \
lpc_asm.s lpc_asm.nasm
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment