[xiph-commits] r3147 - in OggplayPluginWin32SDK/trunk/project_files: libannodex/VS2005 libfishsound/VS2005 libogg/VS2005 liboggplay/VS2005 liboggplayplugin/VS2005 liboggz/VS2005 libsndfile/VS2005 libspeex/VS2005 libtheora/VS2005 libvorbis/VS2005

laser13 at svn.annodex.net laser13 at svn.annodex.net
Thu Jun 28 21:19:36 PDT 2007


Author: laser13
Date: 2007-06-28 21:19:36 -0700 (Thu, 28 Jun 2007)
New Revision: 3147

Modified:
   OggplayPluginWin32SDK/trunk/project_files/libannodex/VS2005/libannodex.vcproj
   OggplayPluginWin32SDK/trunk/project_files/libfishsound/VS2005/libfishsound.vcproj
   OggplayPluginWin32SDK/trunk/project_files/libogg/VS2005/libogg.vcproj
   OggplayPluginWin32SDK/trunk/project_files/liboggplay/VS2005/liboggplay.vcproj
   OggplayPluginWin32SDK/trunk/project_files/liboggplayplugin/VS2005/liboggplugin.vcproj
   OggplayPluginWin32SDK/trunk/project_files/liboggz/VS2005/liboggz.vcproj
   OggplayPluginWin32SDK/trunk/project_files/libsndfile/VS2005/libsndfile.vcproj
   OggplayPluginWin32SDK/trunk/project_files/libspeex/VS2005/libspeex.vcproj
   OggplayPluginWin32SDK/trunk/project_files/libtheora/VS2005/libtheora.vcproj
   OggplayPluginWin32SDK/trunk/project_files/libvorbis/VS2005/libvorbis.vcproj
Log:
Updated Release configuration files. Plugin has to be build in Release mode to run on machine without debug libraries - MS VS libraries, that is.

Modified: OggplayPluginWin32SDK/trunk/project_files/libannodex/VS2005/libannodex.vcproj
===================================================================
--- OggplayPluginWin32SDK/trunk/project_files/libannodex/VS2005/libannodex.vcproj	2007-06-29 04:11:25 UTC (rev 3146)
+++ OggplayPluginWin32SDK/trunk/project_files/libannodex/VS2005/libannodex.vcproj	2007-06-29 04:19:36 UTC (rev 3147)
@@ -19,7 +19,7 @@
 			Name="Debug|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
 			IntermediateDirectory="Debug"
-			ConfigurationType="2"
+			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="2"
 			>
@@ -65,26 +65,12 @@
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="$(SolutionDir)$(ConfigurationName)\liboggz.lib $(SolutionDir)$(ConfigurationName)\libogg.lib"
-				OutputFile="$(OutDir)/libannodex.dll"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories=""
-				ModuleDefinitionFile="..\..\..\lib\libannodex\win32\libannodex.def"
-				AddModuleNamesToAssembly=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/libannodex.pdb"
-				SubSystem="2"
-				ImportLibrary="$(OutDir)/libannodex.lib"
-				TargetMachine="1"
+				Name="VCLibrarianTool"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
 			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
 				Name="VCXDCMakeTool"
 			/>
 			<Tool
@@ -94,27 +80,21 @@
 				Name="VCFxCopTool"
 			/>
 			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
 			IntermediateDirectory="Release"
-			ConfigurationType="2"
+			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				Description="copy liboggz and libogg to output directory"
-				CommandLine="copy ..\..\liboggz\win32\Release\liboggz.dll .\Release&#x0D;&#x0A;copy ..\..\libogg\win32\Dynamic_Release\ogg.dll .\Release&#x0D;&#x0A;"
+				Description=""
+				CommandLine=""
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -130,9 +110,14 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				Optimization="3"
+				InlineFunctionExpansion="2"
+				FavorSizeOrSpeed="1"
 				AdditionalIncludeDirectories="..\..\..\lib\libannodex\win32;..\..\..\lib\libannodex\include;..\..\..\lib\libannodex\src\libannodex;..\..\..\lib\liboggz\include;..\..\..\lib\libogg\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBANNODEX_EXPORTS"
+				ExceptionHandling="0"
 				RuntimeLibrary="0"
+				BufferSecurityCheck="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
@@ -149,25 +134,12 @@
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/libannodex.dll"
-				LinkIncremental="1"
-				ModuleDefinitionFile="..\..\..\lib\libannodex\win32\libannodex.def"
-				AddModuleNamesToAssembly=""
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)/libannodex.lib"
-				TargetMachine="1"
+				Name="VCLibrarianTool"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
 			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
 				Name="VCXDCMakeTool"
 			/>
 			<Tool
@@ -177,12 +149,6 @@
 				Name="VCFxCopTool"
 			/>
 			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>

Modified: OggplayPluginWin32SDK/trunk/project_files/libfishsound/VS2005/libfishsound.vcproj
===================================================================
--- OggplayPluginWin32SDK/trunk/project_files/libfishsound/VS2005/libfishsound.vcproj	2007-06-29 04:11:25 UTC (rev 3146)
+++ OggplayPluginWin32SDK/trunk/project_files/libfishsound/VS2005/libfishsound.vcproj	2007-06-29 04:19:36 UTC (rev 3147)
@@ -59,6 +59,7 @@
 				ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
 				CompileAs="1"
 			/>
@@ -96,7 +97,7 @@
 			Name="Release|Win32"
 			OutputDirectory="."
 			IntermediateDirectory="."
-			ConfigurationType="2"
+			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -125,12 +126,15 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\libogg\include\,..\..\include\,..\,.\"
+				Optimization="3"
+				InlineFunctionExpansion="2"
+				FavorSizeOrSpeed="1"
+				AdditionalIncludeDirectories="..\..\..\lib\libogg\include\;..\..\..\lib\libvorbis\include\;..\..\..\lib\libspeex\include\;..\..\..\lib\libfishsound\include\;..\..\..\lib\libfishsound\win32"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBFISHSOUND_EXPORTS"
 				StringPooling="true"
+				ExceptionHandling="0"
 				RuntimeLibrary="0"
+				BufferSecurityCheck="false"
 				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile="./libfishsound.pch"
 				AssemblerListingLocation="./"
@@ -138,7 +142,8 @@
 				ProgramDataBaseFileName="./"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
-				CompileAs="0"
+				Detect64BitPortabilityProblems="true"
+				CompileAs="1"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -152,25 +157,12 @@
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib ogg.lib vorbis.lib libspeex.lib"
-				OutputFile=".\libfishsound.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\libogg\lib\"
-				ModuleDefinitionFile="..\libfishsound.def"
-				GenerateDebugInformation="false"
-				ProgramDatabaseFile="./libfishsound.pdb"
-				ImportLibrary="./libfishsound.lib"
-				TargetMachine="1"
+				Name="VCLibrarianTool"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
 			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
 				Name="VCXDCMakeTool"
 			/>
 			<Tool
@@ -180,12 +172,6 @@
 				Name="VCFxCopTool"
 			/>
 			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>

Modified: OggplayPluginWin32SDK/trunk/project_files/libogg/VS2005/libogg.vcproj
===================================================================
--- OggplayPluginWin32SDK/trunk/project_files/libogg/VS2005/libogg.vcproj	2007-06-29 04:11:25 UTC (rev 3146)
+++ OggplayPluginWin32SDK/trunk/project_files/libogg/VS2005/libogg.vcproj	2007-06-29 04:19:36 UTC (rev 3147)
@@ -110,7 +110,7 @@
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="..\..\..\include"
+				AdditionalIncludeDirectories="..\..\..\lib\libogg\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBOGG_EXPORTS"
 				StringPooling="true"
 				ExceptionHandling="0"

Modified: OggplayPluginWin32SDK/trunk/project_files/liboggplay/VS2005/liboggplay.vcproj
===================================================================
--- OggplayPluginWin32SDK/trunk/project_files/liboggplay/VS2005/liboggplay.vcproj	2007-06-29 04:11:25 UTC (rev 3146)
+++ OggplayPluginWin32SDK/trunk/project_files/liboggplay/VS2005/liboggplay.vcproj	2007-06-29 04:19:36 UTC (rev 3147)
@@ -103,8 +103,15 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\liboggz\include;..\..\..\..\libogg\include;..\..\..\..\libfishsound\include;..\..\..\..\libtheora\include;..\.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+				Optimization="3"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				AdditionalIncludeDirectories="..\..\..\lib\liboggplay\include;..\..\..\lib\liboggz\include;..\..\..\lib\libogg\include;..\..\..\lib\libfishsound\include;..\..\..\lib\libtheora\include;..\..\..\lib\liboggplay\win32"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;__SSE2__"
+				StringPooling="true"
+				ExceptionHandling="0"
+				BufferSecurityCheck="false"
 				ProgramDataBaseFileName="$(IntDir)\liboggplay.pdb"
 				WarningLevel="3"
 				CompileAs="1"
@@ -120,7 +127,9 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				ModuleDefinitionFile="..\..\liboggplay.def"
+				AdditionalDependencies="Ws2_32.lib "
+				ModuleDefinitionFile=""
+				IgnoreDefaultLibraryNames=""
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -182,19 +191,16 @@
 			<File
 				RelativePath="..\..\..\lib\liboggplay\src\liboggplay\oggplay_seek.c"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\..\lib\liboggplay\src\liboggplay\oggplay_tcp_reader.c"
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\lib\liboggplay\src\liboggplay\oggplay_tools.c"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\lib\liboggplay\src\liboggplay\oggplay_yuv2rgb.c"
 				>
 			</File>

Modified: OggplayPluginWin32SDK/trunk/project_files/liboggplayplugin/VS2005/liboggplugin.vcproj
===================================================================
--- OggplayPluginWin32SDK/trunk/project_files/liboggplayplugin/VS2005/liboggplugin.vcproj	2007-06-29 04:11:25 UTC (rev 3146)
+++ OggplayPluginWin32SDK/trunk/project_files/liboggplayplugin/VS2005/liboggplugin.vcproj	2007-06-29 04:19:36 UTC (rev 3147)
@@ -41,7 +41,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;..\..\..\..\gecko-sdk\include&quot;;..\..\..\lib\liboggplay\plugin\win32;..\..\..\lib\liboggplay\plugin\support;..\..\..\lib\liboggplay\plugin;..\..\..\lib\liboggplay\include;..\..\..\lib\libogg\include;..\..\..\lib\liboggz\include;..\..\..\lib\liboggplay\plugin\audio;..\..\..\lib\liboggplay\plugin\include"
-				PreprocessorDefinitions="_DEBUG;XP_WIN32;MOZILLA_STRICT_API;XPCOM_GLUE;XP_WIN;_X86_;WIN32;_WINDOWS;_USRDLL;NPLIBOGGPLUGIN_EXPORTS"
+				PreprocessorDefinitions="_DEBUG;XP_WIN32;MOZILLA_STRICT_API;XPCOM_GLUE;XP_WIN;_X86_;WIN32;_WINDOWS;_USRDLL;NPLIBOGGPLUGIN_EXPORTS;USE_AUDIO"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -96,7 +96,8 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="copy /Y ..\..\..\sln\Plugin_all_2005\debug\npliboggplugin.dll &quot;c:\Program Files\Mozilla Firefox\plugins&quot;&#x0D;&#x0A;copy /Y ..\..\..\sln\Plugin_all_2005\debug\npliboggplugin.xpt &quot;c:\Program Files\Mozilla Firefox\plugins&quot;&#x0D;&#x0A;"
+				Description="Plugin files installed in Mozilla Firefox"
+				CommandLine="copy /Y $(OutDir)\npliboggplugin.dll &quot;c:\Program Files\Mozilla Firefox\plugins&quot;&#x0D;&#x0A;copy /Y $(OutDir)\npliboggplugin.xpt &quot;c:\Program Files\Mozilla Firefox\plugins&quot;&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -125,12 +126,20 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PLUGIN_EXPORTS"
-				RuntimeLibrary="2"
+				Optimization="3"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				AdditionalIncludeDirectories="&quot;..\..\..\..\gecko-sdk\include&quot;;..\..\..\lib\liboggplay\plugin\win32;..\..\..\lib\liboggplay\plugin\support;..\..\..\lib\liboggplay\plugin;..\..\..\lib\liboggplay\include;..\..\..\lib\libogg\include;..\..\..\lib\liboggz\include;..\..\..\lib\liboggplay\plugin\audio;..\..\..\lib\liboggplay\plugin\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;XP_WIN32;MOZILLA_STRICT_API;XPCOM_GLUE;XP_WIN;_X86_;_WINDOWS;_USRDLL;NPLIBOGGPLUGIN_EXPORTS;USE_AUDIO"
+				StringPooling="true"
+				ExceptionHandling="1"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
+				DebugInformationFormat="0"
+				DisableSpecificWarnings="4311, 4312, 4344, 4100, 4244, 4267, 4189, 4305, 4127, 4706"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -143,7 +152,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="liboggplay.lib libogg.lib liboggz.lib winmm.lib"
+				OutputFile="$(OutDir)\np$(ProjectName).dll"
 				LinkIncremental="1"
+				AdditionalLibraryDirectories="$(OutDir)"
+				IgnoreDefaultLibraryNames=""
+				ModuleDefinitionFile="..\..\..\lib\liboggplay\plugin\win32\liboggplugin.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -173,6 +187,8 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
+				Description="Plugin files installed in Mozilla Firefox"
+				CommandLine="copy /Y $(OutDir)\npliboggplugin.dll &quot;c:\Program Files\Mozilla Firefox\plugins&quot;&#x0D;&#x0A;copy /Y $(OutDir)\npliboggplugin.xpt &quot;c:\Program Files\Mozilla Firefox\plugins&quot;&#x0D;&#x0A;"
 			/>
 		</Configuration>
 	</Configurations>
@@ -209,6 +225,16 @@
 						Outputs="nsILibOggPlugin.h"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="&quot;Running the XPIDL compiler and linker for $(InputName)&quot;"
+						CommandLine="..\..\..\..\gecko-sdk\bin\xpidl -m header -I ..\..\..\..\gecko-sdk\idl -o ..\..\..\lib\liboggplay\plugin\nsILibOggPlugin &quot;$(InputPath)&quot;&#x0D;&#x0A;..\..\..\..\gecko-sdk\bin\xpidl -m typelib -I ..\..\..\..\gecko-sdk\idl -o ..\..\..\lib\liboggplay\plugin\nsILibOggPlugin  &quot;$(InputPath)&quot;&#x0D;&#x0A;..\..\..\..\gecko-sdk\bin\xpt_link  &quot;$(OutDir)\npliboggplugin.xpt&quot; ..\..\..\lib\liboggplay\plugin\nsILibOggPlugin.xpt&#x0D;&#x0A;"
+						Outputs="nsILibOggPlugin.h"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\..\lib\liboggplay\plugin\support\nsScriptablePeer.cpp"
@@ -219,6 +245,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\lib\liboggplay\plugin\plugin_cmml.c"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\lib\liboggplay\plugin\plugin_gui_linux.c"
 				>
 				<FileConfiguration
@@ -229,6 +259,14 @@
 						Name="VCCLCompilerTool"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\..\lib\liboggplay\plugin\plugin_gui_mac.c"
@@ -241,6 +279,14 @@
 						Name="VCCLCompilerTool"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\..\lib\liboggplay\plugin\plugin_gui_win32.c"
@@ -251,10 +297,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\lib\liboggplay\plugin\plugin_playlist.c"
-				>
-			</File>
-			<File
 				RelativePath="..\..\..\lib\liboggplay\plugin\plugin_tools.c"
 				>
 			</File>
@@ -277,6 +319,10 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
+				RelativePath="..\..\..\lib\liboggplay\Installer\install.js"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\lib\liboggplay\plugin\support\nsScriptablePeer.h"
 				>
 			</File>
@@ -289,23 +335,16 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\lib\liboggplay\plugin\plugin_gui.h"
+				RelativePath="..\..\..\lib\liboggplay\plugin\plugin_cmml.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\lib\liboggplay\plugin\plugin_oggplay.h"
+				RelativePath="..\..\..\lib\liboggplay\plugin\plugin_gui.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\lib\liboggplay\plugin\plugin_playlist.h"
+				RelativePath="..\..\..\lib\liboggplay\plugin\plugin_oggplay.h"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\..\lib\liboggplay\plugin\plugin_tools.h"

Modified: OggplayPluginWin32SDK/trunk/project_files/liboggz/VS2005/liboggz.vcproj
===================================================================
--- OggplayPluginWin32SDK/trunk/project_files/liboggz/VS2005/liboggz.vcproj	2007-06-29 04:11:25 UTC (rev 3146)
+++ OggplayPluginWin32SDK/trunk/project_files/liboggz/VS2005/liboggz.vcproj	2007-06-29 04:19:36 UTC (rev 3147)
@@ -16,9 +16,9 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="2"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -47,12 +47,14 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\include\;.;..\..\libogg\include\"
+				Optimization="3"
+				InlineFunctionExpansion="2"
+				FavorSizeOrSpeed="1"
+				AdditionalIncludeDirectories="..\..\..\lib\liboggz\include;..\..\..\lib\liboggz\win32;..\..\..\lib\libogg\include\"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBOGGZ_EXPORTS"
 				StringPooling="true"
 				RuntimeLibrary="0"
+				BufferSecurityCheck="false"
 				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile="./liboggz.pch"
 				AssemblerListingLocation=""
@@ -74,24 +76,12 @@
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib ogg.lib"
-				OutputFile="$(OutDir)/liboggz.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\libogg\win32\Dynamic_Release"
-				ModuleDefinitionFile=".\liboggz.def"
-				ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"
-				ImportLibrary="liboggz.lib"
-				TargetMachine="1"
+				Name="VCLibrarianTool"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
 			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
 				Name="VCXDCMakeTool"
 			/>
 			<Tool
@@ -101,15 +91,10 @@
 				Name="VCFxCopTool"
 			/>
 			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Copy libogg to output directory"
 				CommandLine="copy ..\..\libogg\win32\Dynamic_Release\ogg.dll .\Release"
+				ExcludedFromBuild="true"
 			/>
 		</Configuration>
 		<Configuration

Modified: OggplayPluginWin32SDK/trunk/project_files/libsndfile/VS2005/libsndfile.vcproj
===================================================================
--- OggplayPluginWin32SDK/trunk/project_files/libsndfile/VS2005/libsndfile.vcproj	2007-06-29 04:11:25 UTC (rev 3146)
+++ OggplayPluginWin32SDK/trunk/project_files/libsndfile/VS2005/libsndfile.vcproj	2007-06-29 04:19:36 UTC (rev 3147)
@@ -83,7 +83,7 @@
 			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
 			IntermediateDirectory="Release"
-			ConfigurationType="2"
+			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			>
 			<Tool
@@ -103,11 +103,19 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=""
+				Optimization="3"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="false"
+				FavorSizeOrSpeed="1"
+				AdditionalIncludeDirectories="..\..\..\lib\libsndfile\win32;..\..\..\lib\libsndfile\src;..\..\..\lib\libsndfile\src\GSM610;..\..\..\lib\libsndfile\src\G72x"
 				PreprocessorDefinitions="inline=__inline;WIN32;_USRDLL;NDEBUG"
+				StringPooling="true"
+				ExceptionHandling="0"
 				RuntimeLibrary="2"
+				BufferSecurityCheck="false"
 				ProgramDataBaseFileName="$(IntDir)\libsndfile.pdb"
+				WarningLevel="4"
+				Detect64BitPortabilityProblems="true"
 				CompileAs="1"
 			/>
 			<Tool
@@ -120,19 +128,12 @@
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLinkerTool"
-				ModuleDefinitionFile=""
-				SubSystem="2"
-				ImportLibrary="$(OutDir)/libsndfile.lib"
-				TargetMachine="1"
+				Name="VCLibrarianTool"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
 			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
 				Name="VCXDCMakeTool"
 			/>
 			<Tool
@@ -142,12 +143,6 @@
 				Name="VCFxCopTool"
 			/>
 			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>

Modified: OggplayPluginWin32SDK/trunk/project_files/libspeex/VS2005/libspeex.vcproj
===================================================================
--- OggplayPluginWin32SDK/trunk/project_files/libspeex/VS2005/libspeex.vcproj	2007-06-29 04:11:25 UTC (rev 3146)
+++ OggplayPluginWin32SDK/trunk/project_files/libspeex/VS2005/libspeex.vcproj	2007-06-29 04:19:36 UTC (rev 3147)
@@ -122,7 +122,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
 				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
+				DebugInformationFormat="0"
 				CompileAs="1"
 				DisableSpecificWarnings="4244;4305;4311;4100;4127"
 			/>

Modified: OggplayPluginWin32SDK/trunk/project_files/libtheora/VS2005/libtheora.vcproj
===================================================================
--- OggplayPluginWin32SDK/trunk/project_files/libtheora/VS2005/libtheora.vcproj	2007-06-29 04:11:25 UTC (rev 3146)
+++ OggplayPluginWin32SDK/trunk/project_files/libtheora/VS2005/libtheora.vcproj	2007-06-29 04:19:36 UTC (rev 3147)
@@ -83,7 +83,7 @@
 			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
 			IntermediateDirectory="Release"
-			ConfigurationType="2"
+			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -109,7 +109,7 @@
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include;..\..\..\lib"
+				AdditionalIncludeDirectories="..\..\..\lib\libtheora\include;..\..\..\lib\libogg\include;..\..\..\lib\libtheora\lib"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTHEORA_EXPORTS; USE_ASM"
 				StringPooling="true"
 				ExceptionHandling="0"
@@ -132,25 +132,13 @@
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/libtheora.dll"
-				LinkIncremental="1"
-				ModuleDefinitionFile="..\..\libtheora.def"
-				GenerateDebugInformation="false"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				ImportLibrary="$(OutDir)/libtheora.lib"
-				TargetMachine="1"
+				Name="VCLibrarianTool"
+				AdditionalLibraryDirectories=""
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
 			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
 				Name="VCXDCMakeTool"
 			/>
 			<Tool
@@ -160,12 +148,6 @@
 				Name="VCFxCopTool"
 			/>
 			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>

Modified: OggplayPluginWin32SDK/trunk/project_files/libvorbis/VS2005/libvorbis.vcproj
===================================================================
--- OggplayPluginWin32SDK/trunk/project_files/libvorbis/VS2005/libvorbis.vcproj	2007-06-29 04:11:25 UTC (rev 3146)
+++ OggplayPluginWin32SDK/trunk/project_files/libvorbis/VS2005/libvorbis.vcproj	2007-06-29 04:19:36 UTC (rev 3147)
@@ -63,8 +63,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				AdditionalDependencies="libogg.lib"
-				AdditionalLibraryDirectories="$(SolutionDir)$(ConfigurationName)"
+				AdditionalLibraryDirectories=""
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -86,7 +85,7 @@
 			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
 			IntermediateDirectory="Release"
-			ConfigurationType="2"
+			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -112,7 +111,7 @@
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="..\..\..\include;..\..\..\lib\libogg\include"
+				AdditionalIncludeDirectories="..\..\..\lib\libvorbis\include;..\..\..\lib\libogg\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBVORBIS_EXPORTS"
 				StringPooling="true"
 				ExceptionHandling="0"
@@ -121,7 +120,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
 				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
+				DebugInformationFormat="0"
 				CompileAs="1"
 				DisableSpecificWarnings="4244;4100;4267;4189;4305;4127;4706"
 			/>
@@ -135,25 +134,13 @@
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/libvorbis.dll"
-				LinkIncremental="1"
-				ModuleDefinitionFile="..\..\..\lib\libvorbis\win32\vorbis.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				ImportLibrary="$(OutDir)/libvorbis.lib"
-				TargetMachine="1"
+				Name="VCLibrarianTool"
+				AdditionalLibraryDirectories=""
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
 			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
 				Name="VCXDCMakeTool"
 			/>
 			<Tool
@@ -163,12 +150,6 @@
 				Name="VCFxCopTool"
 			/>
 			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>



More information about the commits mailing list