Author: mikej Date: Thu Oct 18 03:39:25 2007 New Revision: 5964 Modified: freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.vcproj freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.vcproj freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.vcproj freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.vcproj freeswitch/trunk/src/mod/loggers/mod_console/mod_console.vcproj Log: move some modules to use .vsprops files to centralize where settings are made and to simplify the project files. Modified: freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.vcproj ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.vcproj (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.vcproj Thu Oct 18 03:39:25 2007 @@ -17,8 +17,6 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -42,16 +40,12 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";C:\Program Files\Cepstral\sdk\include" + AdditionalIncludeDirectories=""C:\Program Files\Cepstral\sdk\include"" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="0" - WarningLevel="4" - WarnAsError="true" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -65,14 +59,7 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="swift.lib" - OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" - LinkIncremental="1" - AdditionalLibraryDirectories="C:\Program Files\Cepstral\sdk\lib\winnt;..\..\..\..\w32\vsnet\$(OutDir)" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" - SubSystem="2" - ImportLibrary="$(OutDir)/mod_cepstral.lib" - TargetMachine="1" + AdditionalLibraryDirectories=""C:\Program Files\Cepstral\sdk\lib\winnt"" /> <Tool Name="VCALinkTool" @@ -101,8 +88,6 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" @@ -125,14 +110,10 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";C:\Program Files\Cepstral\sdk\include" + AdditionalIncludeDirectories=""C:\Program Files\Cepstral\sdk\include"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" RuntimeLibrary="2" UsePrecompiledHeader="0" - WarningLevel="4" - WarnAsError="true" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -146,17 +127,10 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="swift.lib" - OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" - LinkIncremental="1" - AdditionalLibraryDirectories="C:\Program Files\Cepstral\sdk\lib\winnt;..\..\..\..\w32\vsnet\$(OutDir)" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" - SubSystem="2" + AdditionalLibraryDirectories=""C:\Program Files\Cepstral\sdk\lib\winnt"" OptimizeReferences="2" EnableCOMDATFolding="2" LinkTimeCodeGeneration="1" - ImportLibrary="$(OutDir)/mod_cepstral.lib" - TargetMachine="1" /> <Tool Name="VCALinkTool" Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.vcproj ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.vcproj (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.vcproj Thu Oct 18 03:39:25 2007 @@ -17,8 +17,6 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -41,16 +39,13 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include"" + AdditionalIncludeDirectories="" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="0" - WarningLevel="4" WarnAsError="true" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -63,14 +58,7 @@ /> <Tool Name="VCLinkerTool" - OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" - LinkIncremental="1" - AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" - SubSystem="2" - ImportLibrary="$(OutDir)/mod_dialplan_directory.lib" - TargetMachine="1" + AdditionalLibraryDirectories="" /> <Tool Name="VCALinkTool" @@ -99,8 +87,6 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" @@ -122,13 +108,10 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include"" + AdditionalIncludeDirectories="" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" RuntimeLibrary="2" UsePrecompiledHeader="0" - WarningLevel="4" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -141,16 +124,9 @@ /> <Tool Name="VCLinkerTool" - OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" - LinkIncremental="1" - AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" - SubSystem="2" + AdditionalLibraryDirectories="" OptimizeReferences="2" EnableCOMDATFolding="2" - ImportLibrary="$(OutDir)/mod_dialplan_directory.lib" - TargetMachine="1" /> <Tool Name="VCALinkTool" Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.vcproj ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.vcproj (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.vcproj Thu Oct 18 03:39:25 2007 @@ -17,8 +17,6 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -42,16 +40,13 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include"" + AdditionalIncludeDirectories="" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="0" - WarningLevel="4" WarnAsError="true" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -64,14 +59,7 @@ /> <Tool Name="VCLinkerTool" - OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" - LinkIncremental="1" - AdditionalLibraryDirectories=""..\..\..\..\w32\vsnet\$(OutDir)"" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" - SubSystem="2" - ImportLibrary="$(OutDir)/mod_dialplan_xml.lib" - TargetMachine="1" + AdditionalLibraryDirectories="" /> <Tool Name="VCALinkTool" @@ -100,8 +88,6 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" @@ -124,13 +110,10 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include"" + AdditionalIncludeDirectories="" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" RuntimeLibrary="2" UsePrecompiledHeader="0" - WarningLevel="4" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -143,16 +126,9 @@ /> <Tool Name="VCLinkerTool" - OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" - LinkIncremental="1" - AdditionalLibraryDirectories=""..\..\..\..\w32\vsnet\$(OutDir)"" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" - SubSystem="2" + AdditionalLibraryDirectories="" OptimizeReferences="2" EnableCOMDATFolding="2" - ImportLibrary="$(OutDir)/mod_dialplan_xml.lib" - TargetMachine="1" /> <Tool Name="VCALinkTool" Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.vcproj ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.vcproj (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.vcproj Thu Oct 18 03:39:25 2007 @@ -17,8 +17,6 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -41,15 +39,12 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"C:\Program Files\MySQL\MySQL Server 5.0\include"" + AdditionalIncludeDirectories=""C:\Program Files\MySQL\MySQL Server 5.0\include"" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="0" - WarningLevel="4" - WarnAsError="true" - Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> <Tool @@ -63,14 +58,8 @@ /> <Tool Name="VCLinkerTool" - OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" LinkIncremental="1" AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" - SubSystem="2" - ImportLibrary="$(OutDir)/mod_cdr.lib" - TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -99,8 +88,6 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" @@ -122,13 +109,10 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"C:\Program Files\MySQL\MySQL Server 5.0\include"" + AdditionalIncludeDirectories=""C:\Program Files\MySQL\MySQL Server 5.0\include"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" RuntimeLibrary="2" UsePrecompiledHeader="0" - WarningLevel="4" - WarnAsError="true" - Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> <Tool @@ -142,16 +126,10 @@ /> <Tool Name="VCLinkerTool" - OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" LinkIncremental="1" AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" - SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" - ImportLibrary="$(OutDir)/mod_cdr.lib" - TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -180,8 +158,6 @@ </Configuration> <Configuration Name="Debug with MySql|Win32" - OutputDirectory="Debug" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -204,15 +180,12 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"C:\Program Files\MySQL\MySQL Server 5.0\include"" + AdditionalIncludeDirectories=""C:\Program Files\MySQL\MySQL Server 5.0\include"" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="0" - WarningLevel="4" - WarnAsError="true" - Detect64BitPortabilityProblems="true" DebugInformationFormat="4" /> <Tool @@ -227,14 +200,8 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="mysqlclient.lib ws2_32.lib" - OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" LinkIncremental="2" AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\Debug;"C:\Program Files\MySQL\MySQL Server 5.0\lib\debug"" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" - SubSystem="2" - ImportLibrary="$(OutDir)/mod_cdr.lib" - TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -263,8 +230,6 @@ </Configuration> <Configuration Name="Release with MySql|Win32" - OutputDirectory="Release" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" @@ -286,13 +251,10 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"C:\Program Files\MySQL\MySQL Server 5.0\include"" + AdditionalIncludeDirectories=""C:\Program Files\MySQL\MySQL Server 5.0\include"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" RuntimeLibrary="2" UsePrecompiledHeader="0" - WarningLevel="4" - WarnAsError="true" - Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> <Tool @@ -307,16 +269,10 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="mysqlclient.lib ws2_32.lib" - OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" LinkIncremental="1" AdditionalLibraryDirectories=""..\..\..\..\w32\vsnet\Release";"C:\Program Files\MySQL\MySQL Server 5.0\lib\opt"" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" - SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" - ImportLibrary="$(OutDir)/mod_cdr.lib" - TargetMachine="1" /> <Tool Name="VCALinkTool" Modified: freeswitch/trunk/src/mod/loggers/mod_console/mod_console.vcproj ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_console/mod_console.vcproj (original) +++ freeswitch/trunk/src/mod/loggers/mod_console/mod_console.vcproj Thu Oct 18 03:39:25 2007 @@ -17,8 +17,6 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -41,16 +39,12 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include"" + AdditionalIncludeDirectories="" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="0" - WarningLevel="4" - WarnAsError="true" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -63,14 +57,7 @@ /> <Tool Name="VCLinkerTool" - OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" - LinkIncremental="1" - AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" - SubSystem="2" - ImportLibrary="$(OutDir)/mod_console.lib" - TargetMachine="1" + AdditionalLibraryDirectories="" /> <Tool Name="VCALinkTool" @@ -99,8 +86,6 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" @@ -122,14 +107,10 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include"" + AdditionalIncludeDirectories="" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" RuntimeLibrary="2" UsePrecompiledHeader="0" - WarningLevel="4" - WarnAsError="true" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -142,16 +123,9 @@ /> <Tool Name="VCLinkerTool" - OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" - LinkIncremental="1" - AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" - SubSystem="2" + AdditionalLibraryDirectories="" OptimizeReferences="2" EnableCOMDATFolding="2" - ImportLibrary="$(OutDir)/mod_console.lib" - TargetMachine="1" /> <Tool Name="VCALinkTool"