add asm routines

diff --git a/src/libFLAC/Makefile.am b/src/libFLAC/Makefile.am
index 0ccdd03..80b1dfc 100644 (file)
--- a/src/libFLAC/Makefile.am
+++ b/src/libFLAC/Makefile.am
@@ -2,6 +2,10 @@
 # GNU makefile
 #
 
+SUFFIXES = .nasm
+.nasm.o:
+       $(NASM) -f elf -d ELF -i i386/ $< -o $@
+
 lib_LTLIBRARIES = libFLAC.la
 if DEBUG
 CFLAGS += @CFLAGS@ -DFLAC__PRECOMPUTE_PARTITION_SUMS -DFLAC__OVERFLOW_DETECT
@@ -9,10 +13,47 @@ else
 CFLAGS = @CFLAGS@ -DFLAC__PRECOMPUTE_PARTITION_SUMS
 endif
 
+if FLaC__CPU_IA32 
+if FLaC__HAS_NASM
+libFLAC_la_SOURCES = \
+       bitbuffer.c \
+       bitmath.c \
+       crc.c \
+       cpu.c \
+       encoder.c \
+       encoder_framing.c \
+       file_decoder.c \
+       fixed.c \
+       format.c \
+       lpc.c \
+       md5.c \
+       seek_table.c \
+       stream_decoder.c \
+       i386/cpu_asm.nasm \
+       i386/fixed_asm.nasm \
+       i386/lpc_asm.nasm
+else
+libFLAC_la_SOURCES = \
+       bitbuffer.c \
+       bitmath.c \
+       crc.c \
+       cpu.c \
+       encoder.c \
+       encoder_framing.c \
+       file_decoder.c \
+       fixed.c \
+       format.c \
+       lpc.c \
+       md5.c \
+       seek_table.c \
+       stream_decoder.c
+endif
+else
 libFLAC_la_SOURCES = \
        bitbuffer.c \
        bitmath.c \
        crc.c \
+       cpu.c \
        encoder.c \
        encoder_framing.c \
        file_decoder.c \
@@ -22,3 +63,4 @@ libFLAC_la_SOURCES = \
        md5.c \
        seek_table.c \
        stream_decoder.c
+endif

diff --git a/src/libFLAC/Makefile.lite b/src/libFLAC/Makefile.lite
index c4c39c4..c9c5e5f 100644 (file)
--- a/src/libFLAC/Makefile.lite
+++ b/src/libFLAC/Makefile.lite
@@ -3,13 +3,14 @@
 #
 
 LIB_NAME  = libFLAC
-DEFINES = -DFLAC__PRECOMPUTE_PARTITION_SUMS -DFLAC__ALIGN_MALLOC_DATA
+DEFINES = -DFLAC__CPU_IA32 -DFLAC__HAS_NASM -DFLAC__PRECOMPUTE_PARTITION_SUMS -DFLAC__ALIGN_MALLOC_DATA
 INCLUDES  = -I./include -I../../include
 DEBUG_CFLAGS = -DFLAC__OVERFLOW_DETECT
 
 OBJS = \
        bitbuffer.o \
        bitmath.o \
+       cpu.o \
        crc.o \
        encoder.o \
        encoder_framing.o \
@@ -20,7 +21,10 @@ OBJS = \
        md5.o \
        memory.o \
        seek_table.o \
-       stream_decoder.o
+       stream_decoder.o \
+       i386/cpu_asm.o \
+       i386/fixed_asm.o \
+       i386/lpc_asm.o
 
 include ../../build/lib.mk