[Freeswitch-svn] [commit] r5995 - in freeswitch/trunk: src/mod/languages/mod_spidermonkey src/mod/languages/mod_spidermonkey_core_db src/mod/languages/mod_spidermonkey_etpan src/mod/languages/mod_spidermonkey_odbc src/mod/languages/mod_spidermonkey_socket src/mod/languages/mod_spidermonkey_teletone src/mod/xml_int/mod_xml_cdr src/mod/xml_int/mod_xml_curl src/mod/xml_int/mod_xml_rpc w32 w32/Console w32/Library
Freeswitch SVN
mikej at freeswitch.org
Fri Oct 19 12:09:14 EDT 2007
Author: mikej
Date: Fri Oct 19 12:09:14 2007
New Revision: 5995
Added:
freeswitch/trunk/w32/curl.vsprops
freeswitch/trunk/w32/spidermonkey.vsprops
Modified:
freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.vcproj
freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.vcproj
freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.vcproj
freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.vcproj
freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.vcproj
freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.vcproj
freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.vcproj
freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.vcproj
freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj
freeswitch/trunk/w32/Console/FreeSwitchConsole.vcproj
freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj
Log:
use vsprops files for spidermonkey modules and modules using curl to centralize those settings.
Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.vcproj (original)
+++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.vcproj Fri Oct 19 12:09:14 2007
@@ -18,40 +18,36 @@
<Configuration
Name="Debug|Win32"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
+ InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
CharacterSet="2"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\js\src";"$(InputDir)..\..\..\..\libs\curl\include";"$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include""
- PreprocessorDefinitions="XP_WIN;DEBUG;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE;SM_EXPORTS;JS_HAS_FILE_OBJECT=1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="SM_EXPORTS;JS_HAS_FILE_OBJECT=1"
UsePrecompiledHeader="0"
/>
<Tool
Name="VCLinkerTool"
- LinkLibraryDependencies="true"
- AdditionalDependencies="ws2_32.lib winmm.lib"
- AdditionalLibraryDirectories=""..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib""
+ AdditionalLibraryDirectories=""
/>
</Configuration>
<Configuration
Name="Release|Win32"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
+ InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
CharacterSet="2"
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\js\src";"$(InputDir)..\..\..\..\libs\curl\include";"$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include""
- PreprocessorDefinitions="XP_WIN;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE;SM_EXPORTS;JS_HAS_FILE_OBJECT=1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="SM_EXPORTS;JS_HAS_FILE_OBJECT=1"
UsePrecompiledHeader="0"
/>
<Tool
Name="VCLinkerTool"
- LinkLibraryDependencies="true"
- AdditionalDependencies="ws2_32.lib winmm.lib"
- AdditionalLibraryDirectories=""..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib""
+ AdditionalLibraryDirectories=""
/>
</Configuration>
</Configurations>
Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.vcproj (original)
+++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.vcproj Fri Oct 19 12:09:14 2007
@@ -17,10 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops"
+ InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
CharacterSet="2"
>
<Tool
@@ -41,37 +39,18 @@
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\js\src";"$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include";"$(InputDir)..\mod_spidermonkey""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;XP_WIN;DEBUG;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
+ AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
- WarningLevel="4"
- WarnAsError="true"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
/>
<Tool
Name="VCLinkerTool"
- LinkLibraryDependencies="true"
- OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"
- LinkIncremental="1"
- AdditionalLibraryDirectories=""..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib""
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
- SubSystem="2"
- ImportLibrary="$(OutDir)/mod_spidermonkey_core_db.lib"
- TargetMachine="1"
+ AdditionalLibraryDirectories=""
/>
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops"
+ InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
CharacterSet="2"
>
<Tool
@@ -92,30 +71,12 @@
/>
<Tool
Name="VCCLCompilerTool"
- WholeProgramOptimization="true"
- AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\js\src";"$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include";"$(InputDir)..\mod_spidermonkey""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;XP_WIN;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE"
- RuntimeLibrary="2"
+ AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
- WarningLevel="4"
- WarnAsError="true"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
/>
<Tool
Name="VCLinkerTool"
- LinkLibraryDependencies="true"
- OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"
- LinkIncremental="1"
- AdditionalLibraryDirectories=""..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib""
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
- SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- LinkTimeCodeGeneration="1"
- ImportLibrary="$(OutDir)/mod_spidermonkey_core_db.lib"
- TargetMachine="1"
+ AdditionalLibraryDirectories=""
/>
</Configuration>
</Configurations>
Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.vcproj (original)
+++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.vcproj Fri Oct 19 12:09:14 2007
@@ -17,10 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops"
+ InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
CharacterSet="2"
>
<Tool
@@ -41,37 +39,18 @@
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\js\src";"$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include";"$(InputDir)..\mod_spidermonkey";"$(InputDir)..\..\..\..\libs\libetpan\build-windows\include""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;XP_WIN;DEBUG;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
+ AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\libetpan\build-windows\include""
UsePrecompiledHeader="0"
- WarningLevel="4"
- WarnAsError="true"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
/>
<Tool
Name="VCLinkerTool"
- LinkLibraryDependencies="true"
- OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"
- LinkIncremental="1"
- AdditionalLibraryDirectories=""..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib""
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
- SubSystem="2"
- ImportLibrary="$(OutDir)/mod_spidermonkey_etpan.lib"
- TargetMachine="1"
+ AdditionalLibraryDirectories=""
/>
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops"
+ InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
CharacterSet="2"
>
<Tool
@@ -92,30 +71,12 @@
/>
<Tool
Name="VCCLCompilerTool"
- WholeProgramOptimization="true"
- AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\js\src";"$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include";"$(InputDir)..\mod_spidermonkey";"$(InputDir)..\..\..\..\libs\libetpan\build-windows\include""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;XP_WIN;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE"
- RuntimeLibrary="2"
+ AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\libetpan\build-windows\include""
UsePrecompiledHeader="0"
- WarningLevel="4"
- WarnAsError="true"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
/>
<Tool
Name="VCLinkerTool"
- LinkLibraryDependencies="true"
- OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"
- LinkIncremental="1"
- AdditionalLibraryDirectories=""..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib""
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
- SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- LinkTimeCodeGeneration="1"
- ImportLibrary="$(OutDir)/mod_spidermonkey_etpan.lib"
- TargetMachine="1"
+ AdditionalLibraryDirectories=""
/>
</Configuration>
</Configurations>
Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.vcproj (original)
+++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.vcproj Fri Oct 19 12:09:14 2007
@@ -17,10 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops"
+ InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
CharacterSet="2"
>
<Tool
@@ -41,37 +39,18 @@
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\js\src";"$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include";"$(InputDir)..\mod_spidermonkey""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;XP_WIN;DEBUG;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
+ AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
- WarningLevel="4"
- WarnAsError="true"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
/>
<Tool
Name="VCLinkerTool"
- LinkLibraryDependencies="true"
- OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"
- LinkIncremental="1"
- AdditionalLibraryDirectories=""..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib""
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
- SubSystem="2"
- ImportLibrary="$(OutDir)/mod_spidermonkey_odbc.lib"
- TargetMachine="1"
+ AdditionalLibraryDirectories=""
/>
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops"
+ InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
CharacterSet="2"
>
<Tool
@@ -93,29 +72,16 @@
<Tool
Name="VCCLCompilerTool"
WholeProgramOptimization="true"
- AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\js\src";"$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include";"$(InputDir)..\mod_spidermonkey""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;XP_WIN;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE"
+ AdditionalIncludeDirectories=""
RuntimeLibrary="2"
UsePrecompiledHeader="0"
- WarningLevel="4"
- WarnAsError="true"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
/>
<Tool
Name="VCLinkerTool"
- LinkLibraryDependencies="true"
- OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"
- LinkIncremental="1"
- AdditionalLibraryDirectories=""..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib""
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
- SubSystem="2"
+ AdditionalLibraryDirectories=""
OptimizeReferences="2"
EnableCOMDATFolding="2"
LinkTimeCodeGeneration="1"
- ImportLibrary="$(OutDir)/mod_spidermonkey_odbc.lib"
- TargetMachine="1"
/>
</Configuration>
</Configurations>
Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.vcproj (original)
+++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.vcproj Fri Oct 19 12:09:14 2007
@@ -17,10 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops"
+ InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
CharacterSet="1"
>
<Tool
@@ -40,37 +38,19 @@
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\js\src";"$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include";"$(InputDir)..\mod_spidermonkey""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;XP_WIN;DEBUG;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
+ AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
- WarningLevel="4"
- WarnAsError="true"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
/>
<Tool
Name="VCLinkerTool"
- LinkLibraryDependencies="true"
AdditionalOptions=""..\..\..\..\libs\win32\js\debug\js32.lib" "..\..\..\..\libs\win32\apr\debug\libapr-1.lib" "..\..\..\..\w32\library\debug\freeswitchcore.lib" "..\..\..\..\libs\win32\debug\libetpan.lib" "..\mod_spidermonkey\debug\mod_spidermonkey.lib""
- OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"
- LinkIncremental="1"
- AdditionalLibraryDirectories=""..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib""
- GenerateDebugInformation="true"
- SubSystem="2"
- ImportLibrary="$(OutDir)/mod_spidermonkey_socket.lib"
- TargetMachine="1"
+ AdditionalLibraryDirectories=""
/>
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops"
+ InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
CharacterSet="1"
WholeProgramOptimization="1"
>
@@ -91,22 +71,11 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\js\src";"$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include";"$(InputDir)..\mod_spidermonkey""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;XP_WIN;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE;MOD_SPIDERMONKEY_SOCKET_EXPORTS"
- RuntimeLibrary="2"
+ AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
/>
<Tool
Name="VCLinkerTool"
- LinkIncremental="1"
- GenerateDebugInformation="true"
- SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
/>
</Configuration>
</Configurations>
Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.vcproj (original)
+++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.vcproj Fri Oct 19 12:09:14 2007
@@ -17,10 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops"
+ InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
CharacterSet="2"
>
<Tool
@@ -41,37 +39,18 @@
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\js\src";"$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include";"$(InputDir)..\mod_spidermonkey";"$(InputDir)..\..\..\..\libs\libteletone\src""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;XP_WIN;DEBUG;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
+ AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\libteletone\src""
UsePrecompiledHeader="0"
- WarningLevel="4"
- WarnAsError="true"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
/>
<Tool
Name="VCLinkerTool"
- LinkLibraryDependencies="true"
- OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"
- LinkIncremental="1"
- AdditionalLibraryDirectories=""..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib""
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
- SubSystem="2"
- ImportLibrary="$(OutDir)/mod_spidermonkey_teletone.lib"
- TargetMachine="1"
+ AdditionalLibraryDirectories=""
/>
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops"
+ InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
CharacterSet="2"
>
<Tool
@@ -92,30 +71,15 @@
/>
<Tool
Name="VCCLCompilerTool"
- WholeProgramOptimization="true"
- AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\js\src";"$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include";"$(InputDir)..\mod_spidermonkey";"$(InputDir)..\..\..\..\libs\libteletone\src""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;XP_WIN;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE"
- RuntimeLibrary="2"
+ AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\libteletone\src""
UsePrecompiledHeader="0"
- WarningLevel="4"
- WarnAsError="true"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
/>
<Tool
Name="VCLinkerTool"
- LinkLibraryDependencies="true"
- OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"
- LinkIncremental="1"
- AdditionalLibraryDirectories=""..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib""
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
- SubSystem="2"
+ AdditionalLibraryDirectories=""
OptimizeReferences="2"
EnableCOMDATFolding="2"
LinkTimeCodeGeneration="1"
- ImportLibrary="$(OutDir)/mod_spidermonkey_teletone.lib"
- TargetMachine="1"
/>
</Configuration>
</Configurations>
Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.vcproj (original)
+++ freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.vcproj Fri Oct 19 12:09:14 2007
@@ -18,13 +18,12 @@
<Configuration
Name="Debug|Win32"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
+ InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\curl.vsprops"
CharacterSet="2"
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\curl\include""
- PreprocessorDefinitions="CURL_STATICLIB"
+ AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
<Tool
@@ -34,13 +33,12 @@
<Configuration
Name="Release|Win32"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
+ InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\curl.vsprops"
CharacterSet="2"
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\curl\include""
- PreprocessorDefinitions="CURL_STATICLIB"
+ AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
<Tool
Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.vcproj (original)
+++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.vcproj Fri Oct 19 12:09:14 2007
@@ -18,35 +18,33 @@
<Configuration
Name="Debug|Win32"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
+ InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\curl.vsprops"
CharacterSet="2"
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\xmlrpc-c\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c";"$(InputDir)..\..\..\..\libs\curl\include""
- PreprocessorDefinitions="ABYSS_WIN32;CURL_STATICLIB"
+ AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
<Tool
Name="VCLinkerTool"
- AdditionalLibraryDirectories="..\..\..\..\libs\xmlcurl\lib;"..\..\..\..\libs\xmlcurl\lib\abyss\src\$(OutDir)";"..\..\..\..\libs\apr-util\xml\expat\lib\LibD""
+ AdditionalLibraryDirectories=""
/>
</Configuration>
<Configuration
Name="Release|Win32"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
+ InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\curl.vsprops"
CharacterSet="2"
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\xmlrpc-c\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c";"$(InputDir)..\..\..\..\libs\curl\include""
- PreprocessorDefinitions="CURL_STATICLIB"
+ AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
<Tool
Name="VCLinkerTool"
- AdditionalLibraryDirectories="..\..\..\..\libs\xmlcurl\lib;"..\..\..\..\libs\xmlcurl\lib\abyss\src\$(OutDir)";"..\..\..\..\libs\apr-util\xml\expat\lib\LibR""
+ AdditionalLibraryDirectories=""
/>
</Configuration>
</Configurations>
Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj (original)
+++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj Fri Oct 19 12:09:14 2007
@@ -18,13 +18,13 @@
<Configuration
Name="Debug|Win32"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
+ InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\curl.vsprops"
CharacterSet="2"
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\xmlrpc-c\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c";"$(InputDir)..\..\..\..\libs\curl\include""
- PreprocessorDefinitions="ABYSS_WIN32;CURL_STATICLIB"
+ AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\xmlrpc-c\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c""
+ PreprocessorDefinitions="ABYSS_WIN32"
UsePrecompiledHeader="0"
/>
<Tool
@@ -35,13 +35,13 @@
<Configuration
Name="Release|Win32"
ConfigurationType="2"
- InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
+ InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\curl.vsprops"
CharacterSet="2"
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\xmlrpc-c\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c";"$(InputDir)..\..\..\..\libs\curl\include""
- PreprocessorDefinitions="ABYSS_WIN32;CURL_STATICLIB"
+ AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\xmlrpc-c\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c""
+ PreprocessorDefinitions="ABYSS_WIN32"
UsePrecompiledHeader="0"
/>
<Tool
Modified: freeswitch/trunk/w32/Console/FreeSwitchConsole.vcproj
==============================================================================
--- freeswitch/trunk/w32/Console/FreeSwitchConsole.vcproj (original)
+++ freeswitch/trunk/w32/Console/FreeSwitchConsole.vcproj Fri Oct 19 12:09:14 2007
@@ -20,6 +20,7 @@
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
+ InheritedPropertySheets="..\winlibs.vsprops"
CharacterSet="2"
BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm"
>
@@ -63,7 +64,6 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="advapi32.lib"
OutputFile="$(SolutionDir)$(ConfigurationName)/FreeSwitch.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="$(OutDir)"
@@ -102,6 +102,7 @@
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
+ InheritedPropertySheets="..\winlibs.vsprops"
CharacterSet="2"
BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm"
>
@@ -142,7 +143,6 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="advapi32.lib"
OutputFile="$(SolutionDir)$(ConfigurationName)/FreeSwitch.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="$(OutDir)"
Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj
==============================================================================
--- freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj (original)
+++ freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj Fri Oct 19 12:09:14 2007
@@ -20,6 +20,7 @@
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
+ InheritedPropertySheets="..\winlibs.vsprops"
CharacterSet="2"
BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm"
>
@@ -69,7 +70,6 @@
<Tool
Name="VCLinkerTool"
LinkLibraryDependencies="true"
- AdditionalDependencies="Ws2_32.lib Mswsock.lib Rpcrt4.lib"
OutputFile="$(SolutionDir)$(ConfigurationName)/FreeSwitch.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(InputDir)..\..\libs\apr\$(OutDir)";"$(InputDir)..\..\libs\sqlite\$(OutDir) DLL";"$(InputDir)..\..\libs\apr-util\$(OutDir)";"$(InputDir)..\..\libs\apr-iconv\$(OutDir)";"$(InputDir)..\..\libs\libresample\win";"$(InputDir)..\..\libs\srtp\$(OutDir)""
@@ -113,6 +113,7 @@
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
+ InheritedPropertySheets="..\winlibs.vsprops"
CharacterSet="2"
BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm"
>
@@ -159,7 +160,6 @@
<Tool
Name="VCLinkerTool"
LinkLibraryDependencies="true"
- AdditionalDependencies="Ws2_32.lib Mswsock.lib Rpcrt4.lib"
OutputFile="$(SolutionDir)$(ConfigurationName)/FreeSwitch.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(InputDir)..\..\libs\apr\$(OutDir)";"$(InputDir)..\..\libs\sqlite\$(OutDir) DLL";"$(InputDir)..\..\libs\apr-util\$(OutDir)";"$(InputDir)..\..\libs\apr-iconv\$(OutDir)";"$(InputDir)..\..\libs\libresample\win";"$(InputDir)..\..\libs\srtp\$(OutDir)""
@@ -477,11 +477,11 @@
>
</File>
<File
- RelativePath="..\..\src\include\private\switch_core.h"
+ RelativePath="..\..\src\include\switch_core.h"
>
</File>
<File
- RelativePath="..\..\src\include\switch_core.h"
+ RelativePath="..\..\src\include\private\switch_core.h"
>
</File>
<File
Added: freeswitch/trunk/w32/curl.vsprops
==============================================================================
--- (empty file)
+++ freeswitch/trunk/w32/curl.vsprops Fri Oct 19 12:09:14 2007
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<VisualStudioPropertySheet
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="curl"
+ >
+</VisualStudioPropertySheet>
Added: freeswitch/trunk/w32/spidermonkey.vsprops
==============================================================================
--- (empty file)
+++ freeswitch/trunk/w32/spidermonkey.vsprops Fri Oct 19 12:09:14 2007
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<VisualStudioPropertySheet
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="spidermonkey"
+ >
+</VisualStudioPropertySheet>
More information about the Freeswitch-svn
mailing list