kludge in nasm support

diff --git a/src/libFLAC/Makefile.vc b/src/libFLAC/Makefile.vc
index e7a04bb..9aab688 100644 (file)
--- a/src/libFLAC/Makefile.vc
+++ b/src/libFLAC/Makefile.vc
@@ -1,16 +1,19 @@
 !include <win32.mak>\r
 \r
+NASM=nasmw\r
+\r
 !IFDEF DEBUG\r
 .c.obj:\r
-       $(cc) /D FLAC__PRECOMPUTE_PARTITION_SUMS /D FLAC__OVERFLOW_DETECT /GX $(cdebug) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -YX /Od /D "_DEBUG" $<\r
+       $(cc) /D FLAC__CPU_IA32 /D FLAC__HAS_NASM /D FLAC__PRECOMPUTE_PARTITION_SUMS /D FLAC__OVERFLOW_DETECT /GX $(cdebug) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -YX /Od /D "_DEBUG" $<\r
 !else\r
 .c.obj:\r
-       $(cc) /D FLAC__PRECOMPUTE_PARTITION_SUMS /O2 $(crelease) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -YX -DNODEBUG $<\r
+       $(cc) /D FLAC__CPU_IA32 /D FLAC__HAS_NASM /D FLAC__PRECOMPUTE_PARTITION_SUMS /O2 $(crelease) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -YX -DNODEBUG $<\r
 !endif\r
 \r
 C_FILES= \\r
        bitbuffer.c \\r
        bitmath.c \\r
+       cpu.c \\r
        crc.c \\r
        encoder.c \\r
        encoder_framing.c \\r
@@ -19,16 +22,29 @@ C_FILES= \
        format.c \\r
        lpc.c \\r
        md5.c \\r
+       memory.c \\r
        seek_table.c \\r
        stream_decoder.c\r
 \r
-OBJS= $(C_FILES:.c=.obj)\r
+NASM_FILES= \\r
+       i386/cpu_asm.nasm \\r
+       i386/fixed_asm.nasm \\r
+       i386/lpc_asm.nasm\r
+\r
+OBJS= $(C_FILES:.c=.obj) $(NASM_FILES:.nasm=.obj)\r
 \r
 all: libFLAC.lib\r
 \r
 libFLAC.lib: $(OBJS)\r
        link.exe -lib -out:../../obj/lib/$*.lib $(OBJS)\r
 \r
+i386/cpu_asm.obj: i386/cpu_asm.nasm\r
+       $(NASM) -f win32 -d WIN32 -i i386/ i386/cpu_asm.nasm -o i386/cpu_asm.obj\r
+i386/fixed_asm.obj: i386/fixed_asm.nasm\r
+       $(NASM) -f win32 -d WIN32 -i i386/ i386/fixed_asm.nasm -o i386/fixed_asm.obj\r
+i386/lpc_asm.obj: i386/lpc_asm.nasm\r
+       $(NASM) -f win32 -d WIN32 -i i386/ i386/lpc_asm.nasm -o i386/lpc_asm.obj\r
+\r
 clean:\r
-       -del *.obj *.pch\r
+       -del *.obj i386\*.obj *.pch\r
        -del ..\..\obj\lib\libFLAC.lib ..\..\obj\lib\libFLAC.pdb\r