split most of FileDecoder off to new SeekableStreamDecoder

[platform/upstream/flac.git] / src / libFLAC / Makefile.vc

diff --git a/src/libFLAC/Makefile.vc b/src/libFLAC/Makefile.vc
index 9cfbac5..7adc789 100644 (file)
--- a/src/libFLAC/Makefile.vc
+++ b/src/libFLAC/Makefile.vc
@@ -22,10 +22,10 @@ NASM=nasmw
 \r
 !IFDEF DEBUG\r
 .c.obj:\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
+       $(cc) /D FLAC__CPU_IA32 /D FLAC__HAS_NASM /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__CPU_IA32 /D FLAC__HAS_NASM /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 /O2 $(crelease) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -YX -DNODEBUG $<\r
 !endif\r
 \r
 C_FILES= \\r
@@ -40,29 +40,35 @@ C_FILES= \
        md5.c \\r
        memory.c \\r
        seek_table.c \\r
+       seekable_stream_decoder.c \\r
        stream_decoder.c \\r
        stream_encoder.c \\r
-       stream_encoder_framing.c\r
+       stream_encoder_framing.c \\r
+       utility.c\r
 \r
 NASM_FILES= \\r
-       i386/cpu_asm.nasm \\r
-       i386/fixed_asm.nasm \\r
-       i386/lpc_asm.nasm\r
+       ia32/cpu_asm.nasm \\r
+       ia32/fixed_asm.nasm \\r
+       ia32/lpc_asm.nasm\r
 \r
 OBJS= $(C_FILES:.c=.obj) $(NASM_FILES:.nasm=.obj)\r
 \r
-all: libFLAC.lib\r
+all: ordinals libFLAC.lib\r
+\r
+ordinals: ../../include/FLAC/ordinals.h\r
+../../include/FLAC/ordinals.h: ../../include/FLAC/ordinals.h.in\r
+       sed -e 's/@FLaC__SIZE16@/short/g' -e 's/@FLaC__SIZE32@/int/g' -e 's/@FLaC__SIZE64@/long long/g' -e 's/@FLaC__USIZE16@/unsigned short/g' -e 's/@FLaC__USIZE32@/unsigned int/g' -e 's/@FLaC__USIZE64@/unsigned long long/g' ../../include/FLAC/ordinals.h.in > ../../include/FLAC/ordinals.h\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
+ia32/cpu_asm.obj: ia32/cpu_asm.nasm\r
+       $(NASM) -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/cpu_asm.nasm -o ia32/cpu_asm.obj\r
+ia32/fixed_asm.obj: ia32/fixed_asm.nasm\r
+       $(NASM) -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/fixed_asm.nasm -o ia32/fixed_asm.obj\r
+ia32/lpc_asm.obj: ia32/lpc_asm.nasm\r
+       $(NASM) -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/lpc_asm.nasm -o ia32/lpc_asm.obj\r
 \r
 clean:\r
-       -del *.obj i386\*.obj *.pch\r
+       -del *.obj ia32\*.obj *.pch\r
        -del ..\..\obj\lib\libFLAC.lib ..\..\obj\lib\libFLAC.pdb\r