Author: mikej Date: Thu Oct 18 02:28:27 2007 New Revision: 5962 Added: freeswitch/trunk/w32/module_debug.vsprops freeswitch/trunk/w32/module_release.vsprops freeswitch/trunk/w32/modules.vsprops Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.vcproj freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.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/applications/mod_commands/mod_commands.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.vcproj Thu Oct 18 02:28:27 2007 @@ -5,203 +5,32 @@ Name="mod_commands" ProjectGUID="{30A5B29C-983E-4580-9FD0-D647CCDCC7EB}" RootNamespace="mod_commands" - Keyword="Win32Proj" - > + Keyword="Win32Proj"> <Platforms> - <Platform - Name="Win32" - /> + <Platform Name="Win32"/> </Platforms> <ToolFiles> </ToolFiles> <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\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" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <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_commands.lib" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2"> + <Tool Name="VCCLCompilerTool" UsePrecompiledHeader="0"/> </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include"" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="2" - UsePrecompiledHeader="0" - WarningLevel="4" - WarnAsError="true" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <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_commands.lib" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2"> + <Tool Name="VCCLCompilerTool" UsePrecompiledHeader="0"/> </Configuration> </Configurations> <References> </References> <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" - UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" - > - <File - RelativePath=".\mod_commands.c" - > - </File> - </Filter> - <Filter - Name="Header Files" - Filter="h;hpp;hxx;hm;inl;inc;xsd" - UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" - > - </Filter> - <Filter - Name="Resource Files" - Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" - UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" - > - </Filter> + <File RelativePath=".\mod_commands.c"/> </Files> <Globals> </Globals> Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.vcproj Thu Oct 18 02:28:27 2007 @@ -5,203 +5,32 @@ Name="mod_conference" ProjectGUID="{C24FB505-05D7-4319-8485-7540B44C8603}" RootNamespace="mod_conference" - Keyword="Win32Proj" - > + Keyword="Win32Proj"> <Platforms> - <Platform - Name="Win32" - /> + <Platform Name="Win32"/> </Platforms> <ToolFiles> </ToolFiles> <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\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" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <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_conference.lib" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2"> + <Tool Name="VCCLCompilerTool" UsePrecompiledHeader="0"/> </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include"" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="2" - UsePrecompiledHeader="0" - WarningLevel="4" - WarnAsError="true" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <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_conference.lib" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2"> + <Tool Name="VCCLCompilerTool" UsePrecompiledHeader="0"/> </Configuration> </Configurations> <References> </References> <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" - UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" - > - <File - RelativePath=".\mod_conference.c" - > - </File> - </Filter> - <Filter - Name="Header Files" - Filter="h;hpp;hxx;hm;inl;inc;xsd" - UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" - > - </Filter> - <Filter - Name="Resource Files" - Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" - UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" - > - </Filter> + <File RelativePath=".\mod_conference.c"/> </Files> <Globals> </Globals> Added: freeswitch/trunk/w32/module_debug.vsprops ============================================================================== --- (empty file) +++ freeswitch/trunk/w32/module_debug.vsprops Thu Oct 18 02:28:27 2007 @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" + Name="module_debug" + InheritedPropertySheets=".\modules.vsprops" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="_DEBUG" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + DebugInformationFormat="3" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="1" + /> +</VisualStudioPropertySheet> Added: freeswitch/trunk/w32/module_release.vsprops ============================================================================== --- (empty file) +++ freeswitch/trunk/w32/module_release.vsprops Thu Oct 18 02:28:27 2007 @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" + Name="module_release" + InheritedPropertySheets=".\modules.vsprops" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="NDEBUG" + RuntimeLibrary="2" + DebugInformationFormat="3" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" + /> +</VisualStudioPropertySheet> Added: freeswitch/trunk/w32/modules.vsprops ============================================================================== --- (empty file) +++ freeswitch/trunk/w32/modules.vsprops Thu Oct 18 02:28:27 2007 @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" + Name="modules" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(SolutionDir)\src\include"" + PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;MOD_EXPORTS" + WarningLevel="4" + WarnAsError="true" + Detect64BitPortabilityProblems="true" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" + GenerateDebugInformation="true" + ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" + ImportLibrary="$(OutDir)/$(InputName).lib" + /> +</VisualStudioPropertySheet>