use vsprops files for spidermonkey modules and modules using curl to centralize those settings.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5995 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2007-10-19 16:09:14 +00:00
parent 1934390950
commit 1ffcfd540e
13 changed files with 73 additions and 246 deletions

View File

@ -18,40 +18,36 @@
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
CharacterSet="2" CharacterSet="2"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\js\src&quot;;&quot;$(InputDir)..\..\..\..\libs\curl\include&quot;;&quot;$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include&quot;" AdditionalIncludeDirectories=""
PreprocessorDefinitions="XP_WIN;DEBUG;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE;SM_EXPORTS;JS_HAS_FILE_OBJECT=1" PreprocessorDefinitions="SM_EXPORTS;JS_HAS_FILE_OBJECT=1"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
LinkLibraryDependencies="true" AdditionalLibraryDirectories=""
AdditionalDependencies="ws2_32.lib winmm.lib"
AdditionalLibraryDirectories="&quot;..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib&quot;"
/> />
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
CharacterSet="2" CharacterSet="2"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\js\src&quot;;&quot;$(InputDir)..\..\..\..\libs\curl\include&quot;;&quot;$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include&quot;" AdditionalIncludeDirectories=""
PreprocessorDefinitions="XP_WIN;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE;SM_EXPORTS;JS_HAS_FILE_OBJECT=1" PreprocessorDefinitions="SM_EXPORTS;JS_HAS_FILE_OBJECT=1"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
LinkLibraryDependencies="true" AdditionalLibraryDirectories=""
AdditionalDependencies="ws2_32.lib winmm.lib"
AdditionalLibraryDirectories="&quot;..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib&quot;"
/> />
</Configuration> </Configuration>
</Configurations> </Configurations>

View File

@ -17,10 +17,8 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops" InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
CharacterSet="2" CharacterSet="2"
> >
<Tool <Tool
@ -41,37 +39,18 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" AdditionalIncludeDirectories=""
AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;;&quot;$(InputDir)..\..\..\..\libs\js\src&quot;;&quot;$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include&quot;;&quot;$(InputDir)..\mod_spidermonkey&quot;"
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"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="4"
WarnAsError="true"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
LinkLibraryDependencies="true" AdditionalLibraryDirectories=""
OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"
LinkIncremental="1"
AdditionalLibraryDirectories="&quot;..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib&quot;"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
SubSystem="2"
ImportLibrary="$(OutDir)/mod_spidermonkey_core_db.lib"
TargetMachine="1"
/> />
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops" InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
CharacterSet="2" CharacterSet="2"
> >
<Tool <Tool
@ -92,30 +71,12 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
WholeProgramOptimization="true" AdditionalIncludeDirectories=""
AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;;&quot;$(InputDir)..\..\..\..\libs\js\src&quot;;&quot;$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include&quot;;&quot;$(InputDir)..\mod_spidermonkey&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;XP_WIN;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE"
RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="4"
WarnAsError="true"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
LinkLibraryDependencies="true" AdditionalLibraryDirectories=""
OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"
LinkIncremental="1"
AdditionalLibraryDirectories="&quot;..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib&quot;"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
LinkTimeCodeGeneration="1"
ImportLibrary="$(OutDir)/mod_spidermonkey_core_db.lib"
TargetMachine="1"
/> />
</Configuration> </Configuration>
</Configurations> </Configurations>

View File

@ -17,10 +17,8 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops" InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
CharacterSet="2" CharacterSet="2"
> >
<Tool <Tool
@ -41,37 +39,18 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\libetpan\build-windows\include&quot;"
AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;;&quot;$(InputDir)..\..\..\..\libs\js\src&quot;;&quot;$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include&quot;;&quot;$(InputDir)..\mod_spidermonkey&quot;;&quot;$(InputDir)..\..\..\..\libs\libetpan\build-windows\include&quot;"
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"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="4"
WarnAsError="true"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
LinkLibraryDependencies="true" AdditionalLibraryDirectories=""
OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"
LinkIncremental="1"
AdditionalLibraryDirectories="&quot;..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib&quot;"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
SubSystem="2"
ImportLibrary="$(OutDir)/mod_spidermonkey_etpan.lib"
TargetMachine="1"
/> />
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops" InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
CharacterSet="2" CharacterSet="2"
> >
<Tool <Tool
@ -92,30 +71,12 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
WholeProgramOptimization="true" AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\libetpan\build-windows\include&quot;"
AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;;&quot;$(InputDir)..\..\..\..\libs\js\src&quot;;&quot;$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include&quot;;&quot;$(InputDir)..\mod_spidermonkey&quot;;&quot;$(InputDir)..\..\..\..\libs\libetpan\build-windows\include&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;XP_WIN;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE"
RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="4"
WarnAsError="true"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
LinkLibraryDependencies="true" AdditionalLibraryDirectories=""
OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"
LinkIncremental="1"
AdditionalLibraryDirectories="&quot;..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib&quot;"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
LinkTimeCodeGeneration="1"
ImportLibrary="$(OutDir)/mod_spidermonkey_etpan.lib"
TargetMachine="1"
/> />
</Configuration> </Configuration>
</Configurations> </Configurations>

View File

@ -17,10 +17,8 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops" InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
CharacterSet="2" CharacterSet="2"
> >
<Tool <Tool
@ -41,37 +39,18 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" AdditionalIncludeDirectories=""
AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;;&quot;$(InputDir)..\..\..\..\libs\js\src&quot;;&quot;$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include&quot;;&quot;$(InputDir)..\mod_spidermonkey&quot;"
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"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="4"
WarnAsError="true"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
LinkLibraryDependencies="true" AdditionalLibraryDirectories=""
OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"
LinkIncremental="1"
AdditionalLibraryDirectories="&quot;..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib&quot;"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
SubSystem="2"
ImportLibrary="$(OutDir)/mod_spidermonkey_odbc.lib"
TargetMachine="1"
/> />
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops" InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
CharacterSet="2" CharacterSet="2"
> >
<Tool <Tool
@ -93,29 +72,16 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
WholeProgramOptimization="true" WholeProgramOptimization="true"
AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;;&quot;$(InputDir)..\..\..\..\libs\js\src&quot;;&quot;$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include&quot;;&quot;$(InputDir)..\mod_spidermonkey&quot;" AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;XP_WIN;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="4"
WarnAsError="true"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
LinkLibraryDependencies="true" AdditionalLibraryDirectories=""
OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"
LinkIncremental="1"
AdditionalLibraryDirectories="&quot;..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib&quot;"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
SubSystem="2"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
LinkTimeCodeGeneration="1" LinkTimeCodeGeneration="1"
ImportLibrary="$(OutDir)/mod_spidermonkey_odbc.lib"
TargetMachine="1"
/> />
</Configuration> </Configuration>
</Configurations> </Configurations>

View File

@ -17,10 +17,8 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops" InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
CharacterSet="1" CharacterSet="1"
> >
<Tool <Tool
@ -40,37 +38,19 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" AdditionalIncludeDirectories=""
AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;;&quot;$(InputDir)..\..\..\..\libs\js\src&quot;;&quot;$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include&quot;;&quot;$(InputDir)..\mod_spidermonkey&quot;"
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"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="4"
WarnAsError="true"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
LinkLibraryDependencies="true"
AdditionalOptions="&quot;..\..\..\..\libs\win32\js\debug\js32.lib&quot; &quot;..\..\..\..\libs\win32\apr\debug\libapr-1.lib&quot; &quot;..\..\..\..\w32\library\debug\freeswitchcore.lib&quot; &quot;..\..\..\..\libs\win32\debug\libetpan.lib&quot; &quot;..\mod_spidermonkey\debug\mod_spidermonkey.lib&quot;" AdditionalOptions="&quot;..\..\..\..\libs\win32\js\debug\js32.lib&quot; &quot;..\..\..\..\libs\win32\apr\debug\libapr-1.lib&quot; &quot;..\..\..\..\w32\library\debug\freeswitchcore.lib&quot; &quot;..\..\..\..\libs\win32\debug\libetpan.lib&quot; &quot;..\mod_spidermonkey\debug\mod_spidermonkey.lib&quot;"
OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" AdditionalLibraryDirectories=""
LinkIncremental="1"
AdditionalLibraryDirectories="&quot;..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib&quot;"
GenerateDebugInformation="true"
SubSystem="2"
ImportLibrary="$(OutDir)/mod_spidermonkey_socket.lib"
TargetMachine="1"
/> />
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops" InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
CharacterSet="1" CharacterSet="1"
WholeProgramOptimization="1" WholeProgramOptimization="1"
> >
@ -91,22 +71,11 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;;&quot;$(InputDir)..\..\..\..\libs\js\src&quot;;&quot;$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include&quot;;&quot;$(InputDir)..\mod_spidermonkey&quot;" AdditionalIncludeDirectories=""
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"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
/> />
</Configuration> </Configuration>
</Configurations> </Configurations>

View File

@ -17,10 +17,8 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops" InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
CharacterSet="2" CharacterSet="2"
> >
<Tool <Tool
@ -41,37 +39,18 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\libteletone\src&quot;"
AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;;&quot;$(InputDir)..\..\..\..\libs\js\src&quot;;&quot;$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include&quot;;&quot;$(InputDir)..\mod_spidermonkey&quot;;&quot;$(InputDir)..\..\..\..\libs\libteletone\src&quot;"
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"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="4"
WarnAsError="true"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
LinkLibraryDependencies="true" AdditionalLibraryDirectories=""
OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"
LinkIncremental="1"
AdditionalLibraryDirectories="&quot;..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib&quot;"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
SubSystem="2"
ImportLibrary="$(OutDir)/mod_spidermonkey_teletone.lib"
TargetMachine="1"
/> />
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops" InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
CharacterSet="2" CharacterSet="2"
> >
<Tool <Tool
@ -92,30 +71,15 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
WholeProgramOptimization="true" AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\libteletone\src&quot;"
AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;;&quot;$(InputDir)..\..\..\..\libs\js\src&quot;;&quot;$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include&quot;;&quot;$(InputDir)..\mod_spidermonkey&quot;;&quot;$(InputDir)..\..\..\..\libs\libteletone\src&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;XP_WIN;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE"
RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="4"
WarnAsError="true"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
LinkLibraryDependencies="true" AdditionalLibraryDirectories=""
OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"
LinkIncremental="1"
AdditionalLibraryDirectories="&quot;..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib&quot;"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
SubSystem="2"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
LinkTimeCodeGeneration="1" LinkTimeCodeGeneration="1"
ImportLibrary="$(OutDir)/mod_spidermonkey_teletone.lib"
TargetMachine="1"
/> />
</Configuration> </Configuration>
</Configurations> </Configurations>

View File

@ -18,13 +18,12 @@
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\curl.vsprops"
CharacterSet="2" CharacterSet="2"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\curl\include&quot;" AdditionalIncludeDirectories=""
PreprocessorDefinitions="CURL_STATICLIB"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
/> />
<Tool <Tool
@ -34,13 +33,12 @@
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\curl.vsprops"
CharacterSet="2" CharacterSet="2"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\curl\include&quot;" AdditionalIncludeDirectories=""
PreprocessorDefinitions="CURL_STATICLIB"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
/> />
<Tool <Tool

View File

@ -18,35 +18,33 @@
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\curl.vsprops"
CharacterSet="2" CharacterSet="2"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c\include&quot;;&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c&quot;;&quot;$(InputDir)..\..\..\..\libs\curl\include&quot;" AdditionalIncludeDirectories=""
PreprocessorDefinitions="ABYSS_WIN32;CURL_STATICLIB"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalLibraryDirectories="..\..\..\..\libs\xmlcurl\lib;&quot;..\..\..\..\libs\xmlcurl\lib\abyss\src\$(OutDir)&quot;;&quot;..\..\..\..\libs\apr-util\xml\expat\lib\LibD&quot;" AdditionalLibraryDirectories=""
/> />
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\curl.vsprops"
CharacterSet="2" CharacterSet="2"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c\include&quot;;&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c&quot;;&quot;$(InputDir)..\..\..\..\libs\curl\include&quot;" AdditionalIncludeDirectories=""
PreprocessorDefinitions="CURL_STATICLIB"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalLibraryDirectories="..\..\..\..\libs\xmlcurl\lib;&quot;..\..\..\..\libs\xmlcurl\lib\abyss\src\$(OutDir)&quot;;&quot;..\..\..\..\libs\apr-util\xml\expat\lib\LibR&quot;" AdditionalLibraryDirectories=""
/> />
</Configuration> </Configuration>
</Configurations> </Configurations>

View File

@ -18,13 +18,13 @@
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\curl.vsprops"
CharacterSet="2" CharacterSet="2"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c\include&quot;;&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c&quot;;&quot;$(InputDir)..\..\..\..\libs\curl\include&quot;" AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c\include&quot;;&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c&quot;"
PreprocessorDefinitions="ABYSS_WIN32;CURL_STATICLIB" PreprocessorDefinitions="ABYSS_WIN32"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
/> />
<Tool <Tool
@ -35,13 +35,13 @@
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\curl.vsprops"
CharacterSet="2" CharacterSet="2"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c\include&quot;;&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c&quot;;&quot;$(InputDir)..\..\..\..\libs\curl\include&quot;" AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c\include&quot;;&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c&quot;"
PreprocessorDefinitions="ABYSS_WIN32;CURL_STATICLIB" PreprocessorDefinitions="ABYSS_WIN32"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
/> />
<Tool <Tool

View File

@ -20,6 +20,7 @@
OutputDirectory="$(ConfigurationName)" OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1" ConfigurationType="1"
InheritedPropertySheets="..\winlibs.vsprops"
CharacterSet="2" CharacterSet="2"
BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm"
> >
@ -63,7 +64,6 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="advapi32.lib"
OutputFile="$(SolutionDir)$(ConfigurationName)/FreeSwitch.exe" OutputFile="$(SolutionDir)$(ConfigurationName)/FreeSwitch.exe"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="$(OutDir)" AdditionalLibraryDirectories="$(OutDir)"
@ -102,6 +102,7 @@
OutputDirectory="$(ConfigurationName)" OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1" ConfigurationType="1"
InheritedPropertySheets="..\winlibs.vsprops"
CharacterSet="2" CharacterSet="2"
BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm"
> >
@ -142,7 +143,6 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="advapi32.lib"
OutputFile="$(SolutionDir)$(ConfigurationName)/FreeSwitch.exe" OutputFile="$(SolutionDir)$(ConfigurationName)/FreeSwitch.exe"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="$(OutDir)" AdditionalLibraryDirectories="$(OutDir)"

View File

@ -20,6 +20,7 @@
OutputDirectory="$(ConfigurationName)" OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets="..\winlibs.vsprops"
CharacterSet="2" CharacterSet="2"
BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm"
> >
@ -69,7 +70,6 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
LinkLibraryDependencies="true" LinkLibraryDependencies="true"
AdditionalDependencies="Ws2_32.lib Mswsock.lib Rpcrt4.lib"
OutputFile="$(SolutionDir)$(ConfigurationName)/FreeSwitch.dll" OutputFile="$(SolutionDir)$(ConfigurationName)/FreeSwitch.dll"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="&quot;$(InputDir)..\..\libs\apr\$(OutDir)&quot;;&quot;$(InputDir)..\..\libs\sqlite\$(OutDir) DLL&quot;;&quot;$(InputDir)..\..\libs\apr-util\$(OutDir)&quot;;&quot;$(InputDir)..\..\libs\apr-iconv\$(OutDir)&quot;;&quot;$(InputDir)..\..\libs\libresample\win&quot;;&quot;$(InputDir)..\..\libs\srtp\$(OutDir)&quot;" AdditionalLibraryDirectories="&quot;$(InputDir)..\..\libs\apr\$(OutDir)&quot;;&quot;$(InputDir)..\..\libs\sqlite\$(OutDir) DLL&quot;;&quot;$(InputDir)..\..\libs\apr-util\$(OutDir)&quot;;&quot;$(InputDir)..\..\libs\apr-iconv\$(OutDir)&quot;;&quot;$(InputDir)..\..\libs\libresample\win&quot;;&quot;$(InputDir)..\..\libs\srtp\$(OutDir)&quot;"
@ -113,6 +113,7 @@
OutputDirectory="$(ConfigurationName)" OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets="..\winlibs.vsprops"
CharacterSet="2" CharacterSet="2"
BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm"
> >
@ -159,7 +160,6 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
LinkLibraryDependencies="true" LinkLibraryDependencies="true"
AdditionalDependencies="Ws2_32.lib Mswsock.lib Rpcrt4.lib"
OutputFile="$(SolutionDir)$(ConfigurationName)/FreeSwitch.dll" OutputFile="$(SolutionDir)$(ConfigurationName)/FreeSwitch.dll"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="&quot;$(InputDir)..\..\libs\apr\$(OutDir)&quot;;&quot;$(InputDir)..\..\libs\sqlite\$(OutDir) DLL&quot;;&quot;$(InputDir)..\..\libs\apr-util\$(OutDir)&quot;;&quot;$(InputDir)..\..\libs\apr-iconv\$(OutDir)&quot;;&quot;$(InputDir)..\..\libs\libresample\win&quot;;&quot;$(InputDir)..\..\libs\srtp\$(OutDir)&quot;" AdditionalLibraryDirectories="&quot;$(InputDir)..\..\libs\apr\$(OutDir)&quot;;&quot;$(InputDir)..\..\libs\sqlite\$(OutDir) DLL&quot;;&quot;$(InputDir)..\..\libs\apr-util\$(OutDir)&quot;;&quot;$(InputDir)..\..\libs\apr-iconv\$(OutDir)&quot;;&quot;$(InputDir)..\..\libs\libresample\win&quot;;&quot;$(InputDir)..\..\libs\srtp\$(OutDir)&quot;"
@ -477,11 +477,11 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\include\private\switch_core.h" RelativePath="..\..\src\include\switch_core.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\include\switch_core.h" RelativePath="..\..\src\include\private\switch_core.h"
> >
</File> </File>
<File <File

7
w32/curl.vsprops Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0"?>
<VisualStudioPropertySheet
ProjectType="Visual C++"
Version="8.00"
Name="curl"
>
</VisualStudioPropertySheet>

7
w32/spidermonkey.vsprops Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0"?>
<VisualStudioPropertySheet
ProjectType="Visual C++"
Version="8.00"
Name="spidermonkey"
>
</VisualStudioPropertySheet>