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

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13367 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/Freeswitch.2008.sln b/Freeswitch.2008.sln
index 8e713e5af5ed4d9e0aa63f85bbd21b2c7a78570b..ccbd1a407e6557454ff006718584a7625bc99ab5 100644 (file)
--- a/Freeswitch.2008.sln
+++ b/Freeswitch.2008.sln
@@ -1013,6 +1013,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "32khz music", "libs\win32\S
                {1F0A8A77-E661-418F-BB92-82172AE43803} = {1F0A8A77-E661-418F-BB92-82172AE43803}\r
        EndProjectSection\r
 EndProject\r
+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}"\r
+EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                All|Win32 = All|Win32\r
@@ -2458,6 +2460,17 @@ Global
                {EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.Debug|x64.ActiveCfg = Debug|Win32\r
                {EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.Release|Win32.ActiveCfg = Release|Win32\r
                {EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.Release|x64.ActiveCfg = Release|Win32\r
+               {70564D74-199A-4452-9C60-19ED5F242F0D}.All|Win32.ActiveCfg = Release|x64\r
+               {70564D74-199A-4452-9C60-19ED5F242F0D}.All|x64.ActiveCfg = Release|x64\r
+               {70564D74-199A-4452-9C60-19ED5F242F0D}.All|x64.Build.0 = Release|x64\r
+               {70564D74-199A-4452-9C60-19ED5F242F0D}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {70564D74-199A-4452-9C60-19ED5F242F0D}.Debug|Win32.Build.0 = Debug|Win32\r
+               {70564D74-199A-4452-9C60-19ED5F242F0D}.Debug|x64.ActiveCfg = Debug|x64\r
+               {70564D74-199A-4452-9C60-19ED5F242F0D}.Debug|x64.Build.0 = Debug|x64\r
+               {70564D74-199A-4452-9C60-19ED5F242F0D}.Release|Win32.ActiveCfg = Release|Win32\r
+               {70564D74-199A-4452-9C60-19ED5F242F0D}.Release|Win32.Build.0 = Release|Win32\r
+               {70564D74-199A-4452-9C60-19ED5F242F0D}.Release|x64.ActiveCfg = Release|x64\r
+               {70564D74-199A-4452-9C60-19ED5F242F0D}.Release|x64.Build.0 = Release|x64\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r
@@ -2507,6 +2520,7 @@ Global
                {2CA40887-1622-46A1-A7F9-17FD7E7E545B} = {A5A27244-AD24-46E5-B01B-840CD296C91D}\r
                {6FF941AC-82C5-429F-AA4C-AD2FB9E5DA52} = {A5A27244-AD24-46E5-B01B-840CD296C91D}\r
                {38FE0559-9910-43A8-9E45-3E5004C27692} = {A5A27244-AD24-46E5-B01B-840CD296C91D}\r
+               {70564D74-199A-4452-9C60-19ED5F242F0D} = {A5A27244-AD24-46E5-B01B-840CD296C91D}\r
                {1A1FF289-4FD6-4285-A422-D31DD67A4723} = {CBD81696-EFB4-4D2F-8451-1B8DAA86155A}\r
                {EC3E5C7F-EE09-47E2-80FE-546363D14A98} = {B8F5B47B-8568-46EB-B320-64C17D2A98BC}\r
                {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {0C808854-54D1-4230-BFF5-77B5FD905000}\r

diff --git a/libs/esl/fs_cli.2008.vcproj b/libs/esl/fs_cli.2008.vcproj
index 92e3182bf1b78232512e8b79b453b43639348362..8501539dbbd87bdad412ef96bef2ad9117c352e2 100644 (file)
--- a/libs/esl/fs_cli.2008.vcproj
+++ b/libs/esl/fs_cli.2008.vcproj
@@ -103,7 +103,7 @@
                </Configuration>\r
                <Configuration\r
                        Name="Debug|x64"\r
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
                        CharacterSet="2"\r
@@ -152,7 +152,6 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="Ws2_32.lib"\r
-                               OutputFile="$(SolutionDir)$(PlatformName)\$(ConfigurationName)/fs_cli.exe"\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories="$(OutDir)"\r
                                GenerateDebugInformation="true"\r
@@ -311,7 +310,6 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="Ws2_32.lib"\r
-                               OutputFile="$(SolutionDir)$(ConfigurationName)/fs_cli.exe"\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories="$(OutDir)"\r
                                GenerateDebugInformation="true"\r

diff --git a/src/mod/asr_tts/mod_flite/mod_flite.2008.vcproj b/src/mod/asr_tts/mod_flite/mod_flite.2008.vcproj
index ce05fb5ea7ad6db8f836423814234ee358e2699b..53fdaadb08692afcc44907d7718039a507254f82 100644 (file)
--- a/src/mod/asr_tts/mod_flite/mod_flite.2008.vcproj
+++ b/src/mod/asr_tts/mod_flite/mod_flite.2008.vcproj
@@ -57,9 +57,8 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="flite.lib"\r
                                LinkIncremental="2"\r
-                               AdditionalLibraryDirectories="$(SolutionDir)Debug"\r
+                               AdditionalLibraryDirectories=""\r
                                RandomizedBaseAddress="1"\r
                                DataExecutionPrevention="0"\r
                        />\r
@@ -124,10 +123,9 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="flite.lib"\r
                                OutputFile="$(SolutionDir)$(PlatformName)\$(ConfigurationName)/mod/$(ProjectName).dll"\r
                                LinkIncremental="2"\r
-                               AdditionalLibraryDirectories="$(SolutionDir)Debug"\r
+                               AdditionalLibraryDirectories=""\r
                                RandomizedBaseAddress="1"\r
                                DataExecutionPrevention="0"\r
                                TargetMachine="17"\r

diff --git a/src/mod/formats/mod_file_string/mod_file_string.2008.vcproj b/src/mod/formats/mod_file_string/mod_file_string.2008.vcproj
index 02d3dea7652fb77272ad06b75f4168e4cbd262b5..5168a7029a355424762d453f168efd05d321de8b 100644 (file)
--- a/src/mod/formats/mod_file_string/mod_file_string.2008.vcproj
+++ b/src/mod/formats/mod_file_string/mod_file_string.2008.vcproj
@@ -3,7 +3,7 @@
        ProjectType="Visual C++"\r
        Version="9.00"\r
        Name="mod_file_string"\r
-       ProjectGUID="{2CA40887-1622-46A1-A7F9-17FD7E7E545B}"\r
+       ProjectGUID="{70564D74-199A-4452-9C60-19ED5F242F0D}"\r
        RootNamespace="mod_file_string"\r
        Keyword="Win32Proj"\r
        TargetFrameworkVersion="131072"\r