[Freeswitch-svn] [commit] r13367 - in freeswitch/trunk: . libs/esl src/mod/asr_tts/mod_flite src/mod/formats/mod_file_string

[FreeSWITCH SVN]

Author: mikej
Date: Fri May 15 16:10:48 2009
New Revision: 13367

Log:
Add mod_file_string to build + misc cleaning and correction (FSBUILD-158)

Modified:
   freeswitch/trunk/Freeswitch.2008.sln
   freeswitch/trunk/libs/esl/fs_cli.2008.vcproj
   freeswitch/trunk/src/mod/asr_tts/mod_flite/mod_flite.2008.vcproj
   freeswitch/trunk/src/mod/formats/mod_file_string/mod_file_string.2008.vcproj

Modified: freeswitch/trunk/Freeswitch.2008.sln
==============================================================================
--- freeswitch/trunk/Freeswitch.2008.sln	(original)
+++ freeswitch/trunk/Freeswitch.2008.sln	Fri May 15 16:10:48 2009
@@ -1013,6 +1013,8 @@
 		{1F0A8A77-E661-418F-BB92-82172AE43803} = {1F0A8A77-E661-418F-BB92-82172AE43803}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_file_string", "src\mod\formats\mod_file_string\mod_file_string.2008.vcproj", "{70564D74-199A-4452-9C60-19ED5F242F0D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		All|Win32 = All|Win32
@@ -2458,6 +2460,17 @@
 		{EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.Debug|x64.ActiveCfg = Debug|Win32
 		{EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.Release|Win32.ActiveCfg = Release|Win32
 		{EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.Release|x64.ActiveCfg = Release|Win32
+		{70564D74-199A-4452-9C60-19ED5F242F0D}.All|Win32.ActiveCfg = Release|x64
+		{70564D74-199A-4452-9C60-19ED5F242F0D}.All|x64.ActiveCfg = Release|x64
+		{70564D74-199A-4452-9C60-19ED5F242F0D}.All|x64.Build.0 = Release|x64
+		{70564D74-199A-4452-9C60-19ED5F242F0D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{70564D74-199A-4452-9C60-19ED5F242F0D}.Debug|Win32.Build.0 = Debug|Win32
+		{70564D74-199A-4452-9C60-19ED5F242F0D}.Debug|x64.ActiveCfg = Debug|x64
+		{70564D74-199A-4452-9C60-19ED5F242F0D}.Debug|x64.Build.0 = Debug|x64
+		{70564D74-199A-4452-9C60-19ED5F242F0D}.Release|Win32.ActiveCfg = Release|Win32
+		{70564D74-199A-4452-9C60-19ED5F242F0D}.Release|Win32.Build.0 = Release|Win32
+		{70564D74-199A-4452-9C60-19ED5F242F0D}.Release|x64.ActiveCfg = Release|x64
+		{70564D74-199A-4452-9C60-19ED5F242F0D}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2507,6 +2520,7 @@
 		{2CA40887-1622-46A1-A7F9-17FD7E7E545B} = {A5A27244-AD24-46E5-B01B-840CD296C91D}
 		{6FF941AC-82C5-429F-AA4C-AD2FB9E5DA52} = {A5A27244-AD24-46E5-B01B-840CD296C91D}
 		{38FE0559-9910-43A8-9E45-3E5004C27692} = {A5A27244-AD24-46E5-B01B-840CD296C91D}
+		{70564D74-199A-4452-9C60-19ED5F242F0D} = {A5A27244-AD24-46E5-B01B-840CD296C91D}
 		{1A1FF289-4FD6-4285-A422-D31DD67A4723} = {CBD81696-EFB4-4D2F-8451-1B8DAA86155A}
 		{EC3E5C7F-EE09-47E2-80FE-546363D14A98} = {B8F5B47B-8568-46EB-B320-64C17D2A98BC}
 		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {0C808854-54D1-4230-BFF5-77B5FD905000}

Modified: freeswitch/trunk/libs/esl/fs_cli.2008.vcproj
==============================================================================
--- freeswitch/trunk/libs/esl/fs_cli.2008.vcproj	(original)
+++ freeswitch/trunk/libs/esl/fs_cli.2008.vcproj	Fri May 15 16:10:48 2009
@@ -103,7 +103,7 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="2"
@@ -152,7 +152,6 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="Ws2_32.lib"
-				OutputFile="$(SolutionDir)$(PlatformName)\$(ConfigurationName)/fs_cli.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
 				GenerateDebugInformation="true"
@@ -311,7 +310,6 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="Ws2_32.lib"
-				OutputFile="$(SolutionDir)$(ConfigurationName)/fs_cli.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
 				GenerateDebugInformation="true"

Modified: freeswitch/trunk/src/mod/asr_tts/mod_flite/mod_flite.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/asr_tts/mod_flite/mod_flite.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/asr_tts/mod_flite/mod_flite.2008.vcproj	Fri May 15 16:10:48 2009
@@ -57,9 +57,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="flite.lib"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="$(SolutionDir)Debug"
+				AdditionalLibraryDirectories=""
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 			/>
@@ -124,10 +123,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="flite.lib"
 				OutputFile="$(SolutionDir)$(PlatformName)\$(ConfigurationName)/mod/$(ProjectName).dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="$(SolutionDir)Debug"
+				AdditionalLibraryDirectories=""
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				TargetMachine="17"

Modified: freeswitch/trunk/src/mod/formats/mod_file_string/mod_file_string.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/formats/mod_file_string/mod_file_string.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/formats/mod_file_string/mod_file_string.2008.vcproj	Fri May 15 16:10:48 2009
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="9.00"
 	Name="mod_file_string"
-	ProjectGUID="{2CA40887-1622-46A1-A7F9-17FD7E7E545B}"
+	ProjectGUID="{70564D74-199A-4452-9C60-19ED5F242F0D}"
 	RootNamespace="mod_file_string"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="131072"