[xiph-commits] r11025 - in branches/oggdsf_ce_port: build/oggcodecs_wm5 src/lib/codecs/vorbis/filters/dsfVorbisDecoder src/lib/codecs/vorbis/libs/libvorbis/win32

[illiminable at svn.xiph.org]

Author: illiminable
Date: 2006-03-19 01:35:24 -0800 (Sun, 19 Mar 2006)
New Revision: 11025

Modified:
   branches/oggdsf_ce_port/build/oggcodecs_wm5/oggcodecs_wm5.vddproj
   branches/oggdsf_ce_port/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/vorbisdecoderdllstuff.cpp
   branches/oggdsf_ce_port/src/lib/codecs/vorbis/libs/libvorbis/win32/vorbis_dynamic.vcproj
Log:
* More fixups to the windows mobile builds
* Uncomment some stuff if the registration method which was for debugging a crash.

Modified: branches/oggdsf_ce_port/build/oggcodecs_wm5/oggcodecs_wm5.vddproj
===================================================================
--- branches/oggdsf_ce_port/build/oggcodecs_wm5/oggcodecs_wm5.vddproj	2006-03-19 08:36:53 UTC (rev 11024)
+++ branches/oggdsf_ce_port/build/oggcodecs_wm5/oggcodecs_wm5.vddproj	2006-03-19 09:35:24 UTC (rev 11025)
@@ -20,31 +20,31 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_3C1ED3991BEE4DE79ABEF31F6AEBC705"
+        "MsmKey" = "8:_39EDB4404AB742F1971B32144EDFF907"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_3DF217B99DB14F3CB0C18118683DDE25"
+        "MsmKey" = "8:_3C1ED3991BEE4DE79ABEF31F6AEBC705"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_4811BCC1ADF5454F89B779DF82058CA2"
+        "MsmKey" = "8:_3DF217B99DB14F3CB0C18118683DDE25"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_657FA65D0EF840B58E117C34EF725AE2"
+        "MsmKey" = "8:_4811BCC1ADF5454F89B779DF82058CA2"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_710D82D6AEB54CB287B25DF834D94509"
+        "MsmKey" = "8:_657FA65D0EF840B58E117C34EF725AE2"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -134,10 +134,10 @@
     {
         "File"
         {
-            "{BA458234-9B71-4F46-8107-E91156377184}:_710D82D6AEB54CB287B25DF834D94509"
+            "{BA458234-9B71-4F46-8107-E91156377184}:_39EDB4404AB742F1971B32144EDFF907"
             {
-            "SourcePath" = "8:V:\\Program Files\\Microsoft Visual Studio 8\\VC\\ce\\Dll\\armv4\\msvcr80d.dll"
-            "TargetName" = "8:msvcr80d.dll"
+            "SourcePath" = "8:V:\\Program Files\\Microsoft Visual Studio 8\\VC\\ce\\Dll\\armv4i\\msvcr80.dll"
+            "TargetName" = "8:msvcr80.dll"
             "Tag" = "8:"
             "Folder" = "8:_8BE9216FDC6E4FB1B98829D8873DE833"
             "Condition" = "8:"

Modified: branches/oggdsf_ce_port/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/vorbisdecoderdllstuff.cpp
===================================================================
--- branches/oggdsf_ce_port/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/vorbisdecoderdllstuff.cpp	2006-03-19 08:36:53 UTC (rev 11024)
+++ branches/oggdsf_ce_port/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/vorbisdecoderdllstuff.cpp	2006-03-19 09:35:24 UTC (rev 11025)
@@ -45,7 +45,7 @@
 {
 
 	//MessageBox(NULL, L"xxxxx", L"xxxxx", MB_OK);
-	return S_OK;
+	//return S_OK;
     HRESULT hr;
     
 

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-03-19 08:36:53 UTC (rev 11024)
+++ branches/oggdsf_ce_port/src/lib/codecs/vorbis/libs/libvorbis/win32/vorbis_dynamic.vcproj	2006-03-19 09:35:24 UTC (rev 11025)
@@ -1151,7 +1151,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="Vorbis_Dynamic_Debug/vorbis_d.dll"
+				OutputFile="$(OutDir)/vorbis_d.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=""
@@ -1159,7 +1159,7 @@
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Vorbis_Dynamic_Debug/vorbis_d.pdb"
 				SubSystem="9"
-				ImportLibrary=".\Vorbis_Dynamic_Debug/vorbis_d.lib"
+				ImportLibrary="$(OutDir)/vorbis_d.lib"
 				TargetMachine="0"
 			/>
 			<Tool
@@ -1435,7 +1435,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="Vorbis_Dynamic_Debug/vorbis_d.dll"
+				OutputFile="$(OutDir)/vorbis.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=""
@@ -1443,7 +1443,7 @@
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Vorbis_Dynamic_Debug/vorbis_d.pdb"
 				SubSystem="9"
-				ImportLibrary=".\Vorbis_Dynamic_Debug/vorbis_d.lib"
+				ImportLibrary="$(OutDir)/vorbis.lib"
 				TargetMachine="0"
 			/>
 			<Tool