Large patch from Ben Allison fixing the MSVC build.

[platform/upstream/flac.git] / src / libFLAC / libFLAC_dynamic.dsp

diff --git a/src/libFLAC/libFLAC_dynamic.dsp b/src/libFLAC/libFLAC_dynamic.dsp
index c1c92d8..cecde84 100644 (file)
--- a/src/libFLAC/libFLAC_dynamic.dsp
+++ b/src/libFLAC/libFLAC_dynamic.dsp
@@ -38,12 +38,12 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "..\..\obj\release\lib"\r
+# PROP Output_Dir "..\..\objs\release\lib"\r
 # PROP Intermediate_Dir "Release_dynamic"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c\r
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".\include" /I "..\..\include" /D "NDEBUG" /D "FLAC_API_EXPORTS" /D VERSION=\"1.0.5_beta2\" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c\r
+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".\include" /I "..\..\include" /D "NDEBUG" /D "FLAC_API_EXPORTS" /D "FLAC__HAS_OGG" /D VERSION=\"1.2.1\" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "FLAC__USE_3DNOW" /D FLaC__INLINE=_inline /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\r
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386\r
-# ADD LINK32 /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\obj\release\bin/libFLAC.dll"\r
+# ADD LINK32 ..\..\objs\release\lib\ogg_static.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\objs\release\bin/libFLAC.dll"\r
 \r
 !ELSEIF  "$(CFG)" == "libFLAC_dynamic - Win32 Debug"\r
 \r
@@ -64,12 +64,12 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "..\..\obj\debug\lib"\r
+# PROP Output_Dir "..\..\objs\debug\lib"\r
 # PROP Intermediate_Dir "Debug_dynamic"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c\r
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I ".\include" /I "..\..\include" /D "_DEBUG" /D "FLAC_API_EXPORTS" /D VERSION=\"1.0.5_beta2\" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c\r
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I ".\include" /I "..\..\include" /D "_DEBUG" /D "DEBUG" /D "FLAC__OVERFLOW_DETECT" /D "FLAC_API_EXPORTS" /D "FLAC__HAS_OGG" /D VERSION=\"1.2.1\" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "FLAC__USE_3DNOW" /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\obj\debug\bin/libFLAC.dll" /pdbtype:sept\r
+# ADD LINK32 ..\..\objs\release\lib\ogg_static.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\objs\debug\bin/libFLAC.dll" /pdbtype:sept\r
 \r
 !ENDIF \r
 \r
@@ -95,6 +95,35 @@ LINK32=link.exe
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
+SOURCE=.\ia32\bitreader_asm.nasm\r
+\r
+!IF  "$(CFG)" == "libFLAC_dynamic - Win32 Release"\r
+\r
+USERDEP__CPU_A="ia32/bitreader_asm.nasm"       \r
+# Begin Custom Build\r
+InputPath=.\ia32\bitreader_asm.nasm\r
+\r
+"ia32/bitreader_asm.obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       nasmw.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/bitreader_asm.nasm -o ia32/bitreader_asm.obj\r
+\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "libFLAC_dynamic - Win32 Debug"\r
+\r
+USERDEP__CPU_A="ia32/bitreader_asm.nasm"       \r
+# Begin Custom Build\r
+InputPath=.\ia32\bitreader_asm.nasm\r
+\r
+"ia32/bitreader_asm.obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       nasmw.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/bitreader_asm.nasm -o ia32/bitreader_asm.obj\r
+\r
+# End Custom Build\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\ia32\cpu_asm.nasm\r
 \r
 !IF  "$(CFG)" == "libFLAC_dynamic - Win32 Release"\r
@@ -104,7 +133,7 @@ USERDEP__CPU_A="ia32/cpu_asm.nasm"
 InputPath=.\ia32\cpu_asm.nasm\r
 \r
 "ia32/cpu_asm.obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       %FLAC_NASM% -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/cpu_asm.nasm -o ia32/cpu_asm.obj\r
+       nasmw.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/cpu_asm.nasm -o ia32/cpu_asm.obj\r
 \r
 # End Custom Build\r
 \r
@@ -115,7 +144,7 @@ USERDEP__CPU_A="ia32/cpu_asm.nasm"
 InputPath=.\ia32\cpu_asm.nasm\r
 \r
 "ia32/cpu_asm.obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       %FLAC_NASM% -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/cpu_asm.nasm -o ia32/cpu_asm.obj\r
+       nasmw.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/cpu_asm.nasm -o ia32/cpu_asm.obj\r
 \r
 # End Custom Build\r
 \r
@@ -133,7 +162,7 @@ USERDEP__FIXED="ia32/fixed_asm.nasm"
 InputPath=.\ia32\fixed_asm.nasm\r
 \r
 "ia32/fixed_asm.obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       %FLAC_NASM% -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/fixed_asm.nasm -o ia32/fixed_asm.obj\r
+       nasmw.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/fixed_asm.nasm -o ia32/fixed_asm.obj\r
 \r
 # End Custom Build\r
 \r
@@ -144,7 +173,7 @@ USERDEP__FIXED="ia32/fixed_asm.nasm"
 InputPath=.\ia32\fixed_asm.nasm\r
 \r
 "ia32/fixed_asm.obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       %FLAC_NASM% -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/fixed_asm.nasm -o ia32/fixed_asm.obj\r
+       nasmw.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/fixed_asm.nasm -o ia32/fixed_asm.obj\r
 \r
 # End Custom Build\r
 \r
@@ -162,7 +191,7 @@ USERDEP__LPC_A="ia32/lpc_asm.nasm"
 InputPath=.\ia32\lpc_asm.nasm\r
 \r
 "ia32/lpc_asm.obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       %FLAC_NASM% -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/lpc_asm.nasm -o ia32/lpc_asm.obj\r
+       nasmw.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/lpc_asm.nasm -o ia32/lpc_asm.obj\r
 \r
 # End Custom Build\r
 \r
@@ -173,7 +202,7 @@ USERDEP__LPC_A="ia32/lpc_asm.nasm"
 InputPath=.\ia32\lpc_asm.nasm\r
 \r
 "ia32/lpc_asm.obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       %FLAC_NASM% -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/lpc_asm.nasm -o ia32/lpc_asm.obj\r
+       nasmw.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/lpc_asm.nasm -o ia32/lpc_asm.obj\r
 \r
 # End Custom Build\r
 \r
@@ -182,32 +211,57 @@ InputPath=.\ia32\lpc_asm.nasm
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\ia32\nasm.h\r
+SOURCE=.\ia32\stream_encoder_asm.nasm\r
+\r
+!IF  "$(CFG)" == "libFLAC_dynamic - Win32 Release"\r
+\r
+USERDEP__CPU_A="ia32/stream_encoder_asm.nasm"  \r
+# Begin Custom Build\r
+InputPath=.\ia32\stream_encoder_asm.nasm\r
+\r
+"ia32/stream_encoder_asm.obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       nasmw.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/stream_encoder_asm.nasm -o ia32/stream_encoder_asm.obj\r
+\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "libFLAC_dynamic - Win32 Debug"\r
+\r
+USERDEP__CPU_A="ia32/stream_encoder_asm.nasm"  \r
+# Begin Custom Build\r
+InputPath=.\ia32\stream_encoder_asm.nasm\r
+\r
+"ia32/stream_encoder_asm.obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       nasmw.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/stream_encoder_asm.nasm -o ia32/stream_encoder_asm.obj\r
+\r
+# End Custom Build\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
-# End Group\r
 # Begin Source File\r
 \r
-SOURCE=.\bitbuffer.c\r
+SOURCE=.\ia32\nasm.h\r
 # End Source File\r
+# End Group\r
 # Begin Source File\r
 \r
 SOURCE=.\bitmath.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\cpu.c\r
+SOURCE=.\bitreader.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\crc.c\r
+SOURCE=.\bitwriter.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\file_decoder.c\r
+SOURCE=.\cpu.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\file_encoder.c\r
+SOURCE=.\crc.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -215,6 +269,10 @@ SOURCE=.\fixed.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\float.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\format.c\r
 # End Source File\r
 # Begin Source File\r
@@ -239,11 +297,19 @@ SOURCE=.\metadata_object.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\seekable_stream_decoder.c\r
+SOURCE=.\ogg_decoder_aspect.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\ogg_encoder_aspect.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\ogg_helper.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\seekable_stream_encoder.c\r
+SOURCE=.\ogg_mapping.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -257,6 +323,10 @@ SOURCE=.\stream_encoder.c
 \r
 SOURCE=.\stream_encoder_framing.c\r
 # End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\window.c\r
+# End Source File\r
 # End Group\r
 # Begin Group "Private Header Files"\r
 \r
@@ -267,11 +337,15 @@ SOURCE=.\include\private\all.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\include\private\bitbuffer.h\r
+SOURCE=.\include\private\bitmath.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\include\private\bitmath.h\r
+SOURCE=.\include\private\bitreader.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\include\private\bitwriter.h\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -287,6 +361,10 @@ SOURCE=.\include\private\fixed.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\include\private\float.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\include\private\format.h\r
 # End Source File\r
 # Begin Source File\r
@@ -307,31 +385,35 @@ SOURCE=.\include\private\metadata.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\include\private\stream_encoder_framing.h\r
+SOURCE=.\include\private\ogg_decoder_aspect.h\r
 # End Source File\r
-# End Group\r
-# Begin Group "Protected Header Files"\r
+# Begin Source File\r
 \r
-# PROP Default_Filter ""\r
+SOURCE=.\include\private\ogg_encoder_aspect.h\r
+# End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\include\protected\all.h\r
+SOURCE=.\include\private\ogg_helper.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\include\protected\file_decoder.h\r
+SOURCE=.\include\private\ogg_mapping.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\include\protected\file_encoder.h\r
+SOURCE=.\include\private\stream_encoder_framing.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\include\protected\seekable_stream_decoder.h\r
+SOURCE=.\include\private\window.h\r
 # End Source File\r
+# End Group\r
+# Begin Group "Protected Header Files"\r
+\r
+# PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=.\include\protected\seekable_stream_encoder.h\r
+SOURCE=.\include\protected\all.h\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -359,14 +441,6 @@ SOURCE=..\..\include\FLAC\export.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\FLAC\file_decoder.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\include\FLAC\file_encoder.h\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\include\FLAC\format.h\r
 # End Source File\r
 # Begin Source File\r
@@ -375,42 +449,7 @@ SOURCE=..\..\include\FLAC\metadata.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\FLAC\ordinals.h.in\r
-\r
-!IF  "$(CFG)" == "libFLAC_dynamic - Win32 Release"\r
-\r
-USERDEP__ORDIN="..\..\include\FLAC\ordinals.h.in"      \r
-# Begin Custom Build\r
-InputDir=\home\Administrator\msvc\flac\include\FLAC\r
-InputPath=..\..\include\FLAC\ordinals.h.in\r
-\r
-"$(InputDir)\ordinals.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       copy $(InputDir)\ordinals.h.in $(InputDir)\ordinals.h\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "libFLAC_dynamic - Win32 Debug"\r
-\r
-USERDEP__ORDIN="..\..\include\FLAC\ordinals.h.in"      \r
-# Begin Custom Build\r
-InputDir=\home\Administrator\msvc\flac\include\FLAC\r
-InputPath=..\..\include\FLAC\ordinals.h.in\r
-\r
-"$(InputDir)\ordinals.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       copy $(InputDir)\ordinals.h.in $(InputDir)\ordinals.h\r
-\r
-# End Custom Build\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\include\FLAC\seekable_stream_decoder.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\include\FLAC\seekable_stream_encoder.h\r
+SOURCE=..\..\include\FLAC\ordinals.h\r
 # End Source File\r
 # Begin Source File\r
 \r