[xiph-commits] r11242 - branches/oggdsf_ce_port/build/oggcodecs_wm5
branches/oggdsf_ce_port/sln/oggdsf_all
branches/oggdsf_ce_port/src/lib/codecs/theora/filters/dsfTheoraDecoder
branches/oggdsf_ce_port/src/lib/codecs/theora/libs
branches/oggdsf_ce_port/src/lib/codecs/theora/libs/libOOTheora
branches/oggdsf_ce_port/src/lib/codecs/vorbis/filters/dsfVorbisDecoder
branches/oggdsf_ce_port/src/lib/codecs/vorbis/libs/libvorbis/win32
trunk/speex/win32/VS2005/libspeex
illiminable at svn.xiph.org
illiminable at svn.xiph.org
Sat Apr 22 18:23:24 PDT 2006
Author: illiminable
Date: 2006-04-22 18:22:57 -0700 (Sat, 22 Apr 2006)
New Revision: 11242
Modified:
branches/oggdsf_ce_port/build/oggcodecs_wm5/oggcodecs_wm5.vddproj
branches/oggdsf_ce_port/sln/oggdsf_all/oggdsf_all.sln
branches/oggdsf_ce_port/src/lib/codecs/theora/filters/dsfTheoraDecoder/dsfTheoraDecoder.vcproj
branches/oggdsf_ce_port/src/lib/codecs/theora/libs/
branches/oggdsf_ce_port/src/lib/codecs/theora/libs/libOOTheora/TheoraDecoder.cpp
branches/oggdsf_ce_port/src/lib/codecs/theora/libs/libOOTheora/TheoraDecoder.h
branches/oggdsf_ce_port/src/lib/codecs/theora/libs/libOOTheora/libOOTheora.vcproj
branches/oggdsf_ce_port/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/dsfVorbisDecoder.vcproj
branches/oggdsf_ce_port/src/lib/codecs/vorbis/libs/libvorbis/win32/vorbis_dynamic.vcproj
trunk/speex/win32/VS2005/libspeex/libspeex.vcproj
Log:
* Staticly link to vorbis
* OOTheora has #defines to switch the decoder between libtheora, and theora-exp
* theora-exp now default decoder
Modified: branches/oggdsf_ce_port/build/oggcodecs_wm5/oggcodecs_wm5.vddproj
===================================================================
--- branches/oggdsf_ce_port/build/oggcodecs_wm5/oggcodecs_wm5.vddproj 2006-04-23 01:22:25 UTC (rev 11241)
+++ branches/oggdsf_ce_port/build/oggcodecs_wm5/oggcodecs_wm5.vddproj 2006-04-23 01:22:57 UTC (rev 11242)
@@ -56,34 +56,16 @@
}
"Entry"
{
- "MsmKey" = "8:_99D03DD0E510464783D60DEE08696E18"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_A468F930F587443BA9529CBFA90E8D29"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_BC04D4D4A1EE423EBFA34E91DF63319A"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_E3036F3DC7294931BA2ED09C5AFA0761"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
- "Entry"
- {
- "MsmKey" = "8:_FC0F711C0A9A47699D526C0B5B30DF9E"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
}
"Configurations"
{
@@ -158,24 +140,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
- "{BA458234-9B71-4F46-8107-E91156377184}:_99D03DD0E510464783D60DEE08696E18"
- {
- "SourcePath" = "8:V:\\Program Files\\Microsoft Visual Studio 8\\VC\\ce\\Dll\\armv4i\\msvcr80d.dll"
- "TargetName" = "8:msvcr80d.dll"
- "Tag" = "8:"
- "Folder" = "8:_4F94174C36AD4B1B8302678AD372CE00"
- "Condition" = "8:"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "Register" = "3:0"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
}
"Folder"
{
@@ -403,32 +367,6 @@
{
}
}
- "{605BE39E-5046-48BD-AEC0-63C3A46626D5}:_BC04D4D4A1EE423EBFA34E91DF63319A"
- {
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\vorbis\\libs\\libvorbis\\win32\\Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\\Release_WM5_PPC_ARM\\vorbis.dll"
- "TargetName" = "8:"
- "Tag" = "8:"
- "Folder" = "8:_4F94174C36AD4B1B8302678AD372CE00"
- "Condition" = "8:"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "Register" = "3:0"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- "ProjectOutputGroupRegister" = "3:0"
- "OutputConfiguration" = "8:"
- "OutputGroupCanonicalName" = "8:Built"
- "OutputProjectGuid" = "8:{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}"
- "ShowKeyOutput" = "11:TRUE"
- "ExcludeFilters"
- {
- }
- }
"{605BE39E-5046-48BD-AEC0-63C3A46626D5}:_E3036F3DC7294931BA2ED09C5AFA0761"
{
"SourcePath" = "8:..\\..\\src\\lib\\codecs\\speex\\filters\\dsfSpeexDecoder\\Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\\Release_WM5_PPC_ARM\\dsfSpeexDecoder.dll"
@@ -455,32 +393,6 @@
{
}
}
- "{605BE39E-5046-48BD-AEC0-63C3A46626D5}:_FC0F711C0A9A47699D526C0B5B30DF9E"
- {
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\helper\\libfishsound\\win32\\Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\\Release_WM5_PPC_ARM\\libfishsound.dll"
- "TargetName" = "8:"
- "Tag" = "8:"
- "Folder" = "8:_4F94174C36AD4B1B8302678AD372CE00"
- "Condition" = "8:"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "Register" = "3:0"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- "ProjectOutputGroupRegister" = "3:0"
- "OutputConfiguration" = "8:"
- "OutputGroupCanonicalName" = "8:Built"
- "OutputProjectGuid" = "8:{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}"
- "ShowKeyOutput" = "11:TRUE"
- "ExcludeFilters"
- {
- }
- }
}
"Registry"
{
Modified: branches/oggdsf_ce_port/sln/oggdsf_all/oggdsf_all.sln
===================================================================
--- branches/oggdsf_ce_port/sln/oggdsf_all/oggdsf_all.sln 2006-04-23 01:22:25 UTC (rev 11241)
+++ branches/oggdsf_ce_port/sln/oggdsf_all/oggdsf_all.sln 2006-04-23 01:22:57 UTC (rev 11242)
@@ -98,9 +98,10 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libOOTheora", "..\..\src\lib\codecs\theora\libs\libOOTheora\libOOTheora.vcproj", "{6B20BD7A-644B-4087-9CAC-71B2D68D0231}"
ProjectSection(ProjectDependencies) = postProject
+ {223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5} = {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}
{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA} = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
- {223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfTheoraDecoder", "..\..\src\lib\codecs\theora\filters\dsfTheoraDecoder\dsfTheoraDecoder.vcproj", "{11CBDFD6-0D73-40C0-95DF-997C5FD873F2}"
@@ -1131,11 +1132,13 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testOOTremorDec", "..\..\src\tests\testOOTremorDec\testOOTremorDec.vcproj", "{6D079A10-94A1-4EEC-8E4F-22F865AD47C1}"
ProjectSection(ProjectDependencies) = postProject
+ {620C8CE0-D182-4C0E-B83E-05656ECA971B} = {620C8CE0-D182-4C0E-B83E-05656ECA971B}
+ {7A8E774E-DD94-43B8-8758-6F9F656CC8D2} = {7A8E774E-DD94-43B8-8758-6F9F656CC8D2}
{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
- {7A8E774E-DD94-43B8-8758-6F9F656CC8D2} = {7A8E774E-DD94-43B8-8758-6F9F656CC8D2}
- {620C8CE0-D182-4C0E-B83E-05656ECA971B} = {620C8CE0-D182-4C0E-B83E-05656ECA971B}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtheora-exp_dec", "..\..\src\lib\codecs\theora\libs\libtheora-exp\win32\VS2005\libtheora-exp_dec\libtheora-exp_dec.vcproj", "{A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug Unicode|Any CPU = Debug Unicode|Any CPU
@@ -11479,6 +11482,90 @@
{6D079A10-94A1-4EEC-8E4F-22F865AD47C1}.Release|Win32.ActiveCfg = Release|Win32
{6D079A10-94A1-4EEC-8E4F-22F865AD47C1}.Release|Win32.Build.0 = Release|Win32
{6D079A10-94A1-4EEC-8E4F-22F865AD47C1}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Debug Unicode|Any CPU.ActiveCfg = Debug|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Debug Unicode|Mixed Platforms.ActiveCfg = Debug|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Debug Unicode|Mixed Platforms.Build.0 = Debug|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Debug Unicode|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Debug Unicode|Win32.Build.0 = Debug|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Debug Unicode|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Debug__cdecl|Any CPU.ActiveCfg = Debug|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Debug__cdecl|Mixed Platforms.ActiveCfg = Debug|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Debug__cdecl|Mixed Platforms.Build.0 = Debug|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Debug__cdecl|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Debug__cdecl|Win32.ActiveCfg = Debug|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Debug__cdecl|Win32.Build.0 = Debug|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Debug__cdecl|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Debug_CE_ARM|Any CPU.ActiveCfg = Debug|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Debug_CE_ARM|Mixed Platforms.ActiveCfg = Debug|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Debug_CE_ARM|Mixed Platforms.Build.0 = Debug|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Debug_CE_ARM|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Debug_CE_ARM|Win32.ActiveCfg = Debug|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Debug_CE_ARM|Win32.Build.0 = Debug|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Debug_CE_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Debug_Static|Any CPU.ActiveCfg = Debug|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Debug_Static|Mixed Platforms.ActiveCfg = Debug|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Debug_Static|Mixed Platforms.Build.0 = Debug|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Debug_Static|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Debug_Static|Win32.ActiveCfg = Debug|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Debug_Static|Win32.Build.0 = Debug|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Debug_Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Debug_WM5_PPC_ARM|Any CPU.ActiveCfg = Debug|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Debug_WM5_PPC_ARM|Mixed Platforms.ActiveCfg = Debug|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Debug_WM5_PPC_ARM|Mixed Platforms.Build.0 = Debug|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Debug_WM5_PPC_ARM|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Debug_WM5_PPC_ARM|Win32.ActiveCfg = Debug|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Debug_WM5_PPC_ARM|Win32.Build.0 = Debug|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Debug_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Debug|Win32.ActiveCfg = Debug|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Debug|Win32.Build.0 = Debug|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.MakeFile|Any CPU.ActiveCfg = Release|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.MakeFile|Mixed Platforms.ActiveCfg = Release|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.MakeFile|Mixed Platforms.Build.0 = Release|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.MakeFile|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.MakeFile|Win32.ActiveCfg = Release|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.MakeFile|Win32.Build.0 = Release|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.MakeFile|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Release Unicode|Any CPU.ActiveCfg = Release|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Release Unicode|Mixed Platforms.ActiveCfg = Release|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Release Unicode|Mixed Platforms.Build.0 = Release|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Release Unicode|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Release Unicode|Win32.ActiveCfg = Release|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Release Unicode|Win32.Build.0 = Release|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Release Unicode|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Release__cdecl|Any CPU.ActiveCfg = Release|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Release__cdecl|Mixed Platforms.ActiveCfg = Release|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Release__cdecl|Mixed Platforms.Build.0 = Release|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Release__cdecl|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Release__cdecl|Win32.ActiveCfg = Release|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Release__cdecl|Win32.Build.0 = Release|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Release__cdecl|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Release_NoDotNET|Any CPU.ActiveCfg = Release|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Release_NoDotNET|Mixed Platforms.ActiveCfg = Release|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Release_NoDotNET|Mixed Platforms.Build.0 = Release|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Release_NoDotNET|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Release_NoDotNET|Win32.ActiveCfg = Release|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Release_NoDotNET|Win32.Build.0 = Release|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Release_NoDotNET|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Release_WM5_PPC_ARM|Any CPU.ActiveCfg = Release|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Release_WM5_PPC_ARM|Mixed Platforms.ActiveCfg = Release|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Release_WM5_PPC_ARM|Mixed Platforms.Build.0 = Release|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Release_WM5_PPC_ARM|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Release_WM5_PPC_ARM|Win32.ActiveCfg = Release|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Release_WM5_PPC_ARM|Win32.Build.0 = Release|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Release_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Release|Any CPU.ActiveCfg = Release|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Release|Win32.ActiveCfg = Release|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Release|Win32.Build.0 = Release|Win32
+ {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: branches/oggdsf_ce_port/src/lib/codecs/theora/filters/dsfTheoraDecoder/dsfTheoraDecoder.vcproj
===================================================================
--- branches/oggdsf_ce_port/src/lib/codecs/theora/filters/dsfTheoraDecoder/dsfTheoraDecoder.vcproj 2006-04-23 01:22:25 UTC (rev 11241)
+++ branches/oggdsf_ce_port/src/lib/codecs/theora/filters/dsfTheoraDecoder/dsfTheoraDecoder.vcproj 2006-04-23 01:22:57 UTC (rev 11242)
@@ -47,7 +47,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\libs\libOOTheora;..\..\libs\libtheora\include;..\..\..\..\core\ogg;..\..\..\..\core\ogg\libogg\include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\helper;..\..\..\..\helper\iDSHelper;..\..\..\..\core\directshow\dsfOggDemux2"
+ AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\libs\libOOTheora;..\..\libs\libtheora\include;..\..\..\..\core\ogg;..\..\..\..\core\ogg\libogg\include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\helper;..\..\..\..\helper\iDSHelper;..\..\..\..\core\directshow\dsfOggDemux2;"..\..\libs\libtheora-exp\include""
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFTHEORADECODER_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -298,7 +298,7 @@
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
OmitFramePointers="true"
- AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\libs\libOOTheora;..\..\libs\libtheora\include;..\..\..\..\core\ogg;..\..\..\..\core\ogg\libogg\include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\helper;..\..\..\..\helper\iDSHelper;..\..\..\..\core\directshow\dsfOggDemux2"
+ AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\libs\libOOTheora;..\..\libs\libtheora\include;..\..\..\..\core\ogg;..\..\..\..\core\ogg\libogg\include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\helper;..\..\..\..\helper\iDSHelper;..\..\..\..\core\directshow\dsfOggDemux2;"..\..\libs\libtheora-exp\include""
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFTHEORADECODER_EXPORTS"
StringPooling="true"
RuntimeLibrary="2"
@@ -562,7 +562,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\libs\libOOTheora;..\..\libs\libtheora\include;..\..\..\..\core\ogg;..\..\..\..\core\ogg\libogg\include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\helper;..\..\..\..\helper\iDSHelper;..\..\..\..\core\directshow\dsfOggDemux2"
+ AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\libs\libOOTheora;..\..\libs\libtheora\include;..\..\..\..\core\ogg;..\..\..\..\core\ogg\libogg\include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\helper;..\..\..\..\helper\iDSHelper;..\..\..\..\core\directshow\dsfOggDemux2;"..\..\libs\libtheora-exp\include""
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFTHEORADECODER_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -808,7 +808,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\libs\libOOTheora;..\..\libs\libtheora\include;..\..\..\..\core\ogg;..\..\..\..\core\ogg\libogg\include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\helper;..\..\..\..\helper\iDSHelper;..\..\..\..\core\directshow\dsfOggDemux2"
+ AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\libs\libOOTheora;..\..\libs\libtheora\include;..\..\..\..\core\ogg;..\..\..\..\core\ogg\libogg\include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\helper;..\..\..\..\helper\iDSHelper;..\..\..\..\core\directshow\dsfOggDemux2;"..\..\libs\libtheora-exp\include""
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFTHEORADECODER_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -1055,7 +1055,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\libs\libOOTheora;..\..\libs\libtheora\include;..\..\..\..\core\ogg;..\..\..\..\core\ogg\libogg\include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\helper;..\..\..\..\helper\iDSHelper;..\..\..\..\core\directshow\dsfOggDemux2"
+ AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\libs\libOOTheora;..\..\libs\libtheora\include;..\..\..\..\core\ogg;..\..\..\..\core\ogg\libogg\include;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\helper;..\..\..\..\helper\iDSHelper;..\..\..\..\core\directshow\dsfOggDemux2;"..\..\libs\libtheora-exp\include""
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFTHEORADECODER_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
Property changes on: branches/oggdsf_ce_port/src/lib/codecs/theora/libs
___________________________________________________________________
Name: svn:externals
+ libtheora-exp http://svn.xiph.org/experimental/derf/theora-exp/
Modified: branches/oggdsf_ce_port/src/lib/codecs/theora/libs/libOOTheora/TheoraDecoder.cpp
===================================================================
--- branches/oggdsf_ce_port/src/lib/codecs/theora/libs/libOOTheora/TheoraDecoder.cpp 2006-04-23 01:22:25 UTC (rev 11241)
+++ branches/oggdsf_ce_port/src/lib/codecs/theora/libs/libOOTheora/TheoraDecoder.cpp 2006-04-23 01:22:57 UTC (rev 11242)
@@ -36,6 +36,10 @@
: mFirstPacket(true)
, mFirstHeader(true)
, mPacketCount(0)
+#ifdef USE_THEORA_EXP
+ , mTheoraSetup(NULL)
+ , mTheoraState(NULL)
+#endif
{
}
@@ -45,8 +49,14 @@
bool TheoraDecoder::initCodec()
{
+#ifdef USE_THEORA_EXP
+ th_comment_init(&mTheoraComment);
+ th_info_init(&mTheoraInfo);
+
+#else
theora_comment_init(&mTheoraComment);
theora_info_init(&mTheoraInfo);
+#endif
return true;
}
@@ -57,13 +67,24 @@
if (mPacketCount < 3) {
decodeHeader(inPacket); //Accepts header and deletes it.
+
+ if (mPacketCount == 3) {
+#ifdef USE_THEORA_EXP
+ mTheoraState = th_decode_alloc(&mTheoraInfo, mTheoraSetup);
+#else
+ theora_decode_init(&mTheoraState, &mTheoraInfo);
+#endif
+ //TODO::: Post processing http://people.xiph.org/~tterribe/doc/libtheora-exp/theoradec_8h.html#a1
+
+ }
+
return NULL;
} else {
- if (mFirstPacket) {
- theora_decode_init(&mTheoraState, &mTheoraInfo);
- mFirstPacket = false;
- }
+ //if (mFirstPacket) {
+ // theora_decode_init(&mTheoraState, &mTheoraInfo);
+ // mFirstPacket = false;
+ //}
if ((inPacket->packetSize() > 0) && ((inPacket->packetData()[0] & 128) != 0)) {
//Ignore header packets
delete inPacket;
@@ -71,12 +92,48 @@
}
ogg_packet* locOldPack = simulateOldOggPacket(inPacket); //Accepts the packet and deletes it.
+
+#ifdef USE_THEORA_EXP
+
+ th_decode_packetin(mTheoraState, locOldPack, NULL);
+#else
theora_decode_packetin(&mTheoraState, locOldPack);
+#endif
delete locOldPack->packet;
delete locOldPack;
+#ifdef USE_THEORA_EXP
+ th_decode_ycbcr_out(mTheoraState, mYCbCrBuffer);
+
+ //TODO:::
+ //This is slightly nasty for now... since changing the return type
+ // will screw with other stuff
+ //
+ //Need to probably use the theora-exp buffer type and change all the
+ // uses of yuv_buffer to handle this, and avoid assumptions about
+ // the relative size of the Y and U and V buffers
+
+ if ( ! ( (mYCbCrBuffer[1].width == mYCbCrBuffer[2].width)
+ && (mYCbCrBuffer[1].height == mYCbCrBuffer[2].height)
+ && (mYCbCrBuffer[1].ystride == mYCbCrBuffer[2].ystride)
+ )) {
+ throw "Not 4:2:0 - OOTheora needs fixing";
+ }
+
+ mYUVBuffer.y_width = mYCbCrBuffer[0].width;
+ mYUVBuffer.y_height = mYCbCrBuffer[0].height;
+ mYUVBuffer.y_stride = mYCbCrBuffer[0].ystride;
+ mYUVBuffer.y = (char*)mYCbCrBuffer[0].data;
+ mYUVBuffer.uv_width = mYCbCrBuffer[1].width;
+ mYUVBuffer.uv_height = mYCbCrBuffer[1].height;
+ mYUVBuffer.uv_stride = mYCbCrBuffer[1].ystride;
+ mYUVBuffer.u = (char*)mYCbCrBuffer[1].data;
+ mYUVBuffer.v = (char*)mYCbCrBuffer[2].data;
+
+#else
//Ignore return value... always returns 0 (or crashes :)
theora_decode_YUVout(&mTheoraState, &mYUVBuffer);
+#endif
return &mYUVBuffer;
}
@@ -114,10 +171,17 @@
return false;
}
}
-bool TheoraDecoder::decodeHeader(StampedOggPacket* inHeaderPacket) { //inHeaderPacket is accepted and deleted.
+bool TheoraDecoder::decodeHeader(StampedOggPacket* inHeaderPacket)
+{ //inHeaderPacket is accepted and deleted.
+ //TODO::: Error handling
ogg_packet* locOldPack = simulateOldOggPacket(inHeaderPacket); //Accepts packet and deletes it.
+
+#ifdef USE_THEORA_EXP
+ th_decode_headerin(&mTheoraInfo, &mTheoraComment, &mTheoraSetup, locOldPack);
+#else
theora_decode_header(&mTheoraInfo, &mTheoraComment, locOldPack);
+#endif
delete locOldPack->packet;
delete locOldPack;
Modified: branches/oggdsf_ce_port/src/lib/codecs/theora/libs/libOOTheora/TheoraDecoder.h
===================================================================
--- branches/oggdsf_ce_port/src/lib/codecs/theora/libs/libOOTheora/TheoraDecoder.h 2006-04-23 01:22:25 UTC (rev 11241)
+++ branches/oggdsf_ce_port/src/lib/codecs/theora/libs/libOOTheora/TheoraDecoder.h 2006-04-23 01:22:57 UTC (rev 11242)
@@ -1,5 +1,5 @@
//===========================================================================
-//Copyright (C) 2003, 2004 Zentaro Kavanagh
+//Copyright (C) 2003-2006 Zentaro Kavanagh
//
//Redistribution and use in source and binary forms, with or without
//modification, are permitted provided that the following conditions
@@ -34,7 +34,19 @@
#include <libOOOgg/dllstuff.h>
#include <libOOOgg/StampedOggPacket.h>
extern "C" {
+#define USE_THEORA_EXP
+
+#ifdef USE_THEORA_EXP
+#include "theora/codec.h"
+#include "theora/theoradec.h"
+
+//Need this for yuv_buffer for now.
#include "theora_cdecl.h"
+
+
+#else
+#include "theora_cdecl.h"
+#endif
}
class LIBOOTHEORA_API TheoraDecoder
{
@@ -45,16 +57,16 @@
/// Initialise the internal theora decoder.
bool initCodec();
- //bool resetPackCount();
- //bool clearAll();
-
/// Decode a theora packet returning a yuv_buffer struct. Now owns your packet.
yuv_buffer* decodeTheora(StampedOggPacket* inPacket);
/// Returns true if the packet is a keyframe.
bool isKeyFrame(StampedOggPacket* inPacket);
-
+#ifdef USE_THEORA_EXP
+ th_info mTheoraInfo;
+#else
theora_info mTheoraInfo;
+#endif
protected:
/// Moves the pointers around to make it look like a xiph ogg packet.
@@ -64,8 +76,15 @@
bool decodeHeader(StampedOggPacket* inHeaderPacket);
//theora_info mTheoraInfo;
+#ifdef USE_THEORA_EXP
+ th_ycbcr_buffer mYCbCrBuffer;
+ th_comment mTheoraComment;
+ th_setup_info* mTheoraSetup;
+ th_dec_ctx* mTheoraState;
+#else
theora_comment mTheoraComment;
theora_state mTheoraState;
+#endif
yuv_buffer mYUVBuffer;
StampedOggPacket* mPartialPacket; //TEMP !!
Modified: branches/oggdsf_ce_port/src/lib/codecs/theora/libs/libOOTheora/libOOTheora.vcproj
===================================================================
--- branches/oggdsf_ce_port/src/lib/codecs/theora/libs/libOOTheora/libOOTheora.vcproj 2006-04-23 01:22:25 UTC (rev 11241)
+++ branches/oggdsf_ce_port/src/lib/codecs/theora/libs/libOOTheora/libOOTheora.vcproj 2006-04-23 01:22:57 UTC (rev 11242)
@@ -47,7 +47,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\core\ogg;..\libtheora\include;..\..\..\..\core\ogg\libogg\include;..\..\..\..\helper"
+ AdditionalIncludeDirectories="..\..\..\..\core\ogg;..\libtheora\include;..\..\..\..\core\ogg\libogg\include;..\..\..\..\helper;"..\..\libs\libtheora-exp\include""
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBOOTHEORA_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -56,7 +56,7 @@
WarningLevel="4"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
- CallingConvention="2"
+ CallingConvention="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -292,7 +292,7 @@
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
OmitFramePointers="true"
- AdditionalIncludeDirectories="..\..\..\..\core\ogg;..\libtheora\include;..\..\..\..\core\ogg\libogg\include;..\..\..\..\helper"
+ AdditionalIncludeDirectories="..\..\..\..\core\ogg;..\libtheora\include;..\..\..\..\core\ogg\libogg\include;..\..\..\..\helper;"..\..\libs\libtheora-exp\include""
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBOOTHEORA_EXPORTS"
StringPooling="true"
RuntimeLibrary="2"
@@ -550,7 +550,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\core\ogg;..\libtheora\include;..\..\..\..\core\ogg\libogg\include;..\..\..\..\helper"
+ AdditionalIncludeDirectories="..\..\..\..\core\ogg;..\libtheora\include;..\..\..\..\core\ogg\libogg\include;..\..\..\..\helper;"..\..\libs\libtheora-exp\include""
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBOOTHEORA_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -790,7 +790,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\core\ogg;..\libtheora\include;..\..\..\..\core\ogg\libogg\include;..\..\..\..\helper"
+ AdditionalIncludeDirectories="..\..\..\..\core\ogg;..\libtheora\include;..\..\..\..\core\ogg\libogg\include;..\..\..\..\helper;"..\..\libs\libtheora-exp\include""
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBOOTHEORA_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -1030,7 +1030,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\core\ogg;..\libtheora\include;..\..\..\..\core\ogg\libogg\include;..\..\..\..\helper"
+ AdditionalIncludeDirectories="..\..\..\..\core\ogg;..\libtheora\include;..\..\..\..\core\ogg\libogg\include;..\..\..\..\helper;"..\..\libs\libtheora-exp\include""
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBOOTHEORA_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
Modified: branches/oggdsf_ce_port/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/dsfVorbisDecoder.vcproj
===================================================================
--- branches/oggdsf_ce_port/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/dsfVorbisDecoder.vcproj 2006-04-23 01:22:25 UTC (rev 11241)
+++ branches/oggdsf_ce_port/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/dsfVorbisDecoder.vcproj 2006-04-23 01:22:57 UTC (rev 11242)
@@ -1230,6 +1230,7 @@
WholeProgramOptimization="true"
AdditionalIncludeDirectories="..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\..\helper;..\..\..\..\core\directshow\dsfOggDemux2;..\..\libs\libOOVorbis;..\..\libs\libvorbis\include;..\..\..\..\core\ogg\libogg\include;..\..\libs\libOOTremor;..\..\libs\libtremor"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;USING_TREMOR;WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFVORBISDECODER_EXPORTS;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_)"
+ StringPooling="true"
MinimalRebuild="false"
RuntimeLibrary="2"
TreatWChar_tAsBuiltInType="false"
Modified: branches/oggdsf_ce_port/src/lib/codecs/vorbis/libs/libvorbis/win32/vorbis_dynamic.vcproj
===================================================================
--- branches/oggdsf_ce_port/src/lib/codecs/vorbis/libs/libvorbis/win32/vorbis_dynamic.vcproj 2006-04-23 01:22:25 UTC (rev 11241)
+++ branches/oggdsf_ce_port/src/lib/codecs/vorbis/libs/libvorbis/win32/vorbis_dynamic.vcproj 2006-04-23 01:22:57 UTC (rev 11242)
@@ -1096,7 +1096,7 @@
Name="Debug_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
- ConfigurationType="2"
+ ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@@ -1150,17 +1150,8 @@
Name="VCPreLinkEventTool"
/>
<Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)/vorbis_d.dll"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories=""
- ModuleDefinitionFile=".\vorbis.def"
- GenerateDebugInformation="true"
- ProgramDatabaseFile=".\Vorbis_Dynamic_Debug/vorbis_d.pdb"
- SubSystem="9"
- ImportLibrary="$(OutDir)/vorbis_d.lib"
- TargetMachine="0"
+ Name="VCLibrarianTool"
+ AdditionalOptions=""
/>
<Tool
Name="VCALinkTool"
@@ -1380,7 +1371,7 @@
Name="Release_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
- ConfigurationType="2"
+ ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@@ -1438,21 +1429,8 @@
Name="VCPreLinkEventTool"
/>
<Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)/vorbis.dll"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories=""
- ModuleDefinitionFile=".\vorbis.def"
- GenerateDebugInformation="false"
- ProgramDatabaseFile=".\Vorbis_Dynamic_Debug/vorbis_d.pdb"
- SubSystem="9"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- OptimizeForWindows98="1"
- LinkTimeCodeGeneration="1"
- ImportLibrary="$(OutDir)/vorbis.lib"
- TargetMachine="0"
+ Name="VCLibrarianTool"
+ AdditionalOptions=""
/>
<Tool
Name="VCALinkTool"
Modified: trunk/speex/win32/VS2005/libspeex/libspeex.vcproj
===================================================================
--- trunk/speex/win32/VS2005/libspeex/libspeex.vcproj 2006-04-23 01:22:25 UTC (rev 11241)
+++ trunk/speex/win32/VS2005/libspeex/libspeex.vcproj 2006-04-23 01:22:57 UTC (rev 11242)
@@ -3,7 +3,7 @@
ProjectType="Visual C++"
Version="8.00"
Name="libspeex"
- ProjectGUID="{E972C52F-9E85-4D65-B19C-031E511E9DB4}"
+ ProjectGUID="{6D653C6F-8722-4B10-9C3A-CB7094DD159F}"
RootNamespace="libspeex"
Keyword="Win32Proj"
>
More information about the commits
mailing list