[Sox-commits] sox/msvc9 LibSndFile.vcproj, 1.1, 1.2 LibSoX.vcproj, 1.1, 1.2

[Doug C. <idi...@us...>]

Update of /cvsroot/sox/sox/msvc9
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv25171/msvc9

Modified Files:
	LibSndFile.vcproj LibSoX.vcproj 
Log Message:
The MSVC build of LibSndFile isn't officially supported or tested, so I'm a bit
nervous about statically linking the MSVC build of LibSndFile into SoX. Static
linking is probably more convenient and efficient, but if there is a problem
with the way I'm building LibSndFile, the user wouldn't be able to do anything
to fix it. It seems to be a lot safer to have SoX load LibSndFile as a DLL.


Index: LibSndFile.vcproj
===================================================================
RCS file: /cvsroot/sox/sox/msvc9/LibSndFile.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- LibSndFile.vcproj	2 Dec 2009 11:18:43 -0000	1.1
+++ LibSndFile.vcproj	14 Dec 2009 07:27:19 -0000	1.2
@@ -20,7 +20,7 @@
 			Name="Debug|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)\lib\"
 			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
+			ConfigurationType="2"
 			CharacterSet="0"
 			>
 			<Tool
@@ -67,12 +67,20 @@
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLibrarianTool"
+				Name="VCLinkerTool"
+				OutputFile="$(SolutionDir)$(ConfigurationName)\$(ProjectName)-1.dll"
+				ModuleDefinitionFile="..\..\libsndfile\src\libsndfile-1.def"
+				GenerateDebugInformation="true"
+				SetChecksum="true"
+				ImportLibrary="$(OutDir)$(TargetName).lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
 			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
 				Name="VCXDCMakeTool"
 			/>
 			<Tool
@@ -82,6 +90,9 @@
 				Name="VCFxCopTool"
 			/>
 			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
@@ -89,7 +100,7 @@
 			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)\lib\"
 			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
+			ConfigurationType="2"
 			CharacterSet="0"
 			WholeProgramOptimization="1"
 			>
@@ -136,12 +147,22 @@
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLibrarianTool"
+				Name="VCLinkerTool"
+				OutputFile="$(SolutionDir)$(ConfigurationName)\$(ProjectName)-1.dll"
+				ModuleDefinitionFile="..\..\libsndfile\src\libsndfile-1.def"
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				SetChecksum="true"
+				ImportLibrary="$(OutDir)$(TargetName).lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
 			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
 				Name="VCXDCMakeTool"
 			/>
 			<Tool
@@ -151,6 +172,9 @@
 				Name="VCFxCopTool"
 			/>
 			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>

Index: LibSoX.vcproj
===================================================================
RCS file: /cvsroot/sox/sox/msvc9/LibSoX.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- LibSoX.vcproj	2 Dec 2009 11:18:43 -0000	1.1
+++ LibSoX.vcproj	14 Dec 2009 07:27:19 -0000	1.2
@@ -580,14 +580,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\skeleff.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\skelform.c"
-				>
-			</File>
-			<File
 				RelativePath="..\src\smp.c"
 				>
 			</File>
@@ -1130,6 +1122,46 @@
 				</FileConfiguration>
 			</File>
 			<File
+				RelativePath="..\src\skeleff.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\src\skelform.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
 				RelativePath="..\src\sndio.c"
 				>
 				<FileConfiguration