X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2FlibFLAC%2FlibFLAC_dynamic.dsp;h=cecde84aaaadc3a282076a3e7d4281627587b7d8;hb=a4c321e492748db0a7e38240699ba420ba88e01c;hp=4e9491c1b681a1e1c67d95fa2dfa459c54e33b2f;hpb=4d9780d4e427c18f23a55e99910e1487162776a5;p=platform%2Fupstream%2Fflac.git

diff --git a/src/libFLAC/libFLAC_dynamic.dsp b/src/libFLAC/libFLAC_dynamic.dsp
index 4e9491c..cecde84 100644
--- a/src/libFLAC/libFLAC_dynamic.dsp
+++ b/src/libFLAC/libFLAC_dynamic.dsp
@@ -38,12 +38,12 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\obj\release\lib"
+# PROP Output_Dir "..\..\objs\release\lib"
 # PROP Intermediate_Dir "Release_dynamic"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".\include" /I "..\..\include" /D "NDEBUG" /D "FLAC_API_EXPORTS" /D VERSION=\"1.1.1\" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "FLAC__USE_3DNOW" /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c
+# 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
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # 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
-# ADD LINK32 /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\obj\release\bin/libFLAC.dll"
+# ADD LINK32 ..\..\objs\release\lib\ogg_static.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\objs\release\bin/libFLAC.dll"
 
 !ELSEIF  "$(CFG)" == "libFLAC_dynamic - Win32 Debug"
 
@@ -64,12 +64,12 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\obj\debug\lib"
+# PROP Output_Dir "..\..\objs\debug\lib"
 # PROP Intermediate_Dir "Debug_dynamic"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I ".\include" /I "..\..\include" /D "_DEBUG" /D "FLAC_API_EXPORTS" /D VERSION=\"1.1.1\" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "FLAC__USE_3DNOW" /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c
+# 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
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # 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
-# ADD LINK32 /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\obj\debug\bin/libFLAC.dll" /pdbtype:sept
+# ADD LINK32 ..\..\objs\release\lib\ogg_static.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\objs\debug\bin/libFLAC.dll" /pdbtype:sept
 
 !ENDIF 
 
@@ -95,6 +95,35 @@ LINK32=link.exe
 # PROP Default_Filter ""
 # Begin Source File
 
+SOURCE=.\ia32\bitreader_asm.nasm
+
+!IF  "$(CFG)" == "libFLAC_dynamic - Win32 Release"
+
+USERDEP__CPU_A="ia32/bitreader_asm.nasm"	
+# Begin Custom Build
+InputPath=.\ia32\bitreader_asm.nasm
+
+"ia32/bitreader_asm.obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	nasmw.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/bitreader_asm.nasm -o ia32/bitreader_asm.obj
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "libFLAC_dynamic - Win32 Debug"
+
+USERDEP__CPU_A="ia32/bitreader_asm.nasm"	
+# Begin Custom Build
+InputPath=.\ia32\bitreader_asm.nasm
+
+"ia32/bitreader_asm.obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	nasmw.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/bitreader_asm.nasm -o ia32/bitreader_asm.obj
+
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\ia32\cpu_asm.nasm
 
 !IF  "$(CFG)" == "libFLAC_dynamic - Win32 Release"
@@ -182,32 +211,57 @@ InputPath=.\ia32\lpc_asm.nasm
 # End Source File
 # Begin Source File
 
-SOURCE=.\ia32\nasm.h
+SOURCE=.\ia32\stream_encoder_asm.nasm
+
+!IF  "$(CFG)" == "libFLAC_dynamic - Win32 Release"
+
+USERDEP__CPU_A="ia32/stream_encoder_asm.nasm"	
+# Begin Custom Build
+InputPath=.\ia32\stream_encoder_asm.nasm
+
+"ia32/stream_encoder_asm.obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	nasmw.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/stream_encoder_asm.nasm -o ia32/stream_encoder_asm.obj
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "libFLAC_dynamic - Win32 Debug"
+
+USERDEP__CPU_A="ia32/stream_encoder_asm.nasm"	
+# Begin Custom Build
+InputPath=.\ia32\stream_encoder_asm.nasm
+
+"ia32/stream_encoder_asm.obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	nasmw.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/stream_encoder_asm.nasm -o ia32/stream_encoder_asm.obj
+
+# End Custom Build
+
+!ENDIF 
+
 # End Source File
-# End Group
 # Begin Source File
 
-SOURCE=.\bitbuffer.c
+SOURCE=.\ia32\nasm.h
 # End Source File
+# End Group
 # Begin Source File
 
 SOURCE=.\bitmath.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\cpu.c
+SOURCE=.\bitreader.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\crc.c
+SOURCE=.\bitwriter.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\file_decoder.c
+SOURCE=.\cpu.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\file_encoder.c
+SOURCE=.\crc.c
 # End Source File
 # Begin Source File
 
@@ -215,6 +269,10 @@ SOURCE=.\fixed.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\float.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\format.c
 # End Source File
 # Begin Source File
@@ -239,11 +297,19 @@ SOURCE=.\metadata_object.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\seekable_stream_decoder.c
+SOURCE=.\ogg_decoder_aspect.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ogg_encoder_aspect.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\seekable_stream_encoder.c
+SOURCE=.\ogg_helper.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ogg_mapping.c
 # End Source File
 # Begin Source File
 
@@ -257,6 +323,10 @@ SOURCE=.\stream_encoder.c
 
 SOURCE=.\stream_encoder_framing.c
 # End Source File
+# Begin Source File
+
+SOURCE=.\window.c
+# End Source File
 # End Group
 # Begin Group "Private Header Files"
 
@@ -267,11 +337,15 @@ SOURCE=.\include\private\all.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\include\private\bitbuffer.h
+SOURCE=.\include\private\bitmath.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\include\private\bitmath.h
+SOURCE=.\include\private\bitreader.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\private\bitwriter.h
 # End Source File
 # Begin Source File
 
@@ -287,6 +361,10 @@ SOURCE=.\include\private\fixed.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\include\private\float.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\include\private\format.h
 # End Source File
 # Begin Source File
@@ -307,31 +385,35 @@ SOURCE=.\include\private\metadata.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\include\private\stream_encoder_framing.h
+SOURCE=.\include\private\ogg_decoder_aspect.h
 # End Source File
-# End Group
-# Begin Group "Protected Header Files"
+# Begin Source File
 
-# PROP Default_Filter ""
+SOURCE=.\include\private\ogg_encoder_aspect.h
+# End Source File
 # Begin Source File
 
-SOURCE=.\include\protected\all.h
+SOURCE=.\include\private\ogg_helper.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\include\protected\file_decoder.h
+SOURCE=.\include\private\ogg_mapping.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\include\protected\file_encoder.h
+SOURCE=.\include\private\stream_encoder_framing.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\include\protected\seekable_stream_decoder.h
+SOURCE=.\include\private\window.h
 # End Source File
+# End Group
+# Begin Group "Protected Header Files"
+
+# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\include\protected\seekable_stream_encoder.h
+SOURCE=.\include\protected\all.h
 # End Source File
 # Begin Source File
 
@@ -359,14 +441,6 @@ SOURCE=..\..\include\FLAC\export.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\FLAC\file_decoder.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FLAC\file_encoder.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\FLAC\format.h
 # End Source File
 # Begin Source File
@@ -379,14 +453,6 @@ SOURCE=..\..\include\FLAC\ordinals.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\FLAC\seekable_stream_decoder.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FLAC\seekable_stream_encoder.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\FLAC\stream_decoder.h
 # End Source File
 # Begin Source File