[xiph-commits] r11456 - in trunk/theora: lib win32/VS2005/encoder_example win32/VS2005/libtheora

[illiminable at svn.xiph.org]

Author: illiminable
Date: 2006-05-28 13:27:27 -0700 (Sun, 28 May 2006)
New Revision: 11456

Modified:
   trunk/theora/lib/cpu.c
   trunk/theora/lib/dsp.h
   trunk/theora/lib/reconstruct.c
   trunk/theora/win32/VS2005/encoder_example/encoder_example.vcproj
   trunk/theora/win32/VS2005/libtheora/libtheora.vcproj
Log:
* Change all the asm gaurds, since __i386__ etc. are not defined on windows and so none of those branches were being taken.
* Change the gaurds in reconstruct and dsp so they are consistent with dct


Modified: trunk/theora/lib/cpu.c
===================================================================
--- trunk/theora/lib/cpu.c	2006-05-28 19:12:32 UTC (rev 11455)
+++ trunk/theora/lib/cpu.c	2006-05-28 20:27:27 UTC (rev 11456)
@@ -67,7 +67,7 @@
 #endif
 }
 
-#if defined(USE_ASM) && (defined(__i386__) || defined(__x86_64__))
+#if defined(USE_ASM) && (defined(__i386__) || defined(__x86_64__) || defined(WIN32))
 
 static ogg_uint32_t cpu_get_flags (void)
 {

Modified: trunk/theora/lib/dsp.h
===================================================================
--- trunk/theora/lib/dsp.h	2006-05-28 19:12:32 UTC (rev 11455)
+++ trunk/theora/lib/dsp.h	2006-05-28 20:27:27 UTC (rev 11456)
@@ -85,7 +85,7 @@
 
 void dsp_init(DspFunctions *funcs);
 void dsp_static_init(DspFunctions *funcs);
-#if defined(USE_ASM) && (defined(__i386__) || defined(__x86_64__))
+#if defined(USE_ASM) && (defined(__i386__) || defined(__x86_64__) || defined(WIN32))
 extern void dsp_mmx_init(DspFunctions *funcs);
 extern void dsp_mmxext_init(DspFunctions *funcs);
 extern void dsp_mmx_fdct_init(DspFunctions *funcs);

Modified: trunk/theora/lib/reconstruct.c
===================================================================
--- trunk/theora/lib/reconstruct.c	2006-05-28 19:12:32 UTC (rev 11455)
+++ trunk/theora/lib/reconstruct.c	2006-05-28 20:27:27 UTC (rev 11456)
@@ -104,7 +104,7 @@
   funcs->recon_intra8x8 = recon_intra8x8__c;
   funcs->recon_inter8x8 = recon_inter8x8__c;
   funcs->recon_inter8x8_half = recon_inter8x8_half__c;
-#if (defined(__i386__) || defined(__x86_64__))
+#if defined(USE_ASM)
   if (cpu_flags & CPU_X86_MMX) {
     dsp_mmx_recon_init(funcs);
   }

Modified: trunk/theora/win32/VS2005/encoder_example/encoder_example.vcproj
===================================================================
--- trunk/theora/win32/VS2005/encoder_example/encoder_example.vcproj	2006-05-28 19:12:32 UTC (rev 11455)
+++ trunk/theora/win32/VS2005/encoder_example/encoder_example.vcproj	2006-05-28 20:27:27 UTC (rev 11456)
@@ -48,7 +48,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"

Modified: trunk/theora/win32/VS2005/libtheora/libtheora.vcproj
===================================================================
--- trunk/theora/win32/VS2005/libtheora/libtheora.vcproj	2006-05-28 19:12:32 UTC (rev 11455)
+++ trunk/theora/win32/VS2005/libtheora/libtheora.vcproj	2006-05-28 20:27:27 UTC (rev 11456)
@@ -17,7 +17,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
 			IntermediateDirectory="Debug"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -49,7 +49,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -98,7 +98,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
 			IntermediateDirectory="Release"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"