kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix mod_spidermonkey load on windows 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@738 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2006-03-03 08:24:25 +00:00
parent 79e34c97db
commit a73ef856cf
3 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libs/libteletone/libteletone.vcproj
View File

@ -19,7 +19,7 @@
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4"
ConfigurationType="2"
CharacterSet="1"
>
<Tool
@ -61,11 +61,17 @@
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
Name="VCLinkerTool"
OptimizeReferences="1"
EnableCOMDATFolding="1"
OptimizeForWindows98="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
@ -75,6 +81,12 @@
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
@ -83,7 +95,7 @@
Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4"
ConfigurationType="2"
CharacterSet="1"
WholeProgramOptimization="1"
>
@ -123,11 +135,14 @@
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
Name="VCLinkerTool"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
@ -137,6 +152,12 @@
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>

8
src/mod/languages/mod_spidermonkey/mod_spidermonkey.vcproj
View File

@ -64,10 +64,10 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="js32.lib curllib.lib ws2_32.lib winmm.lib sqlite.lib"
AdditionalDependencies="js32.lib curllib.lib ws2_32.lib winmm.lib sqlite.lib fdlibm.lib libnspr4.lib libplc4.lib libplds4.lib"
OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_spidermonkey.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\js\src\Debug&quot;;&quot;$(InputDir)..\..\..\..\libs\curl\lib\Debug&quot;;&quot;$(InputDir)..\..\..\..\libs\sqlite\Debug&quot;"
AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\js\src\Debug&quot;;&quot;$(InputDir)..\..\..\..\libs\curl\lib\Debug&quot;;&quot;$(InputDir)..\..\..\..\libs\sqlite\Debug&quot;;&quot;$(InputDir)..\..\..\..\libs\js\nspr\lib&quot;"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/mod_spidermonkey.pdb"
SubSystem="2"
@ -145,10 +145,10 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="js32.lib curllib.lib ws2_32.lib winmm.lib sqlite.lib"
AdditionalDependencies="js32.lib curllib.lib ws2_32.lib winmm.lib sqlite.lib fdlibm.lib libnspr4.lib libplc4.lib libplds4.lib"
OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_spidermonkey.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\js\Release&quot;;&quot;$(InputDir)..\..\..\..\libs\curl\lib\Release&quot;;&quot;$(InputDir)..\..\..\..\libs\sqlite\Release&quot;"
AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\js\Release&quot;;&quot;$(InputDir)..\..\..\..\libs\curl\lib\Release&quot;;&quot;$(InputDir)..\..\..\..\libs\sqlite\Release&quot;;&quot;$(InputDir)..\..\..\..\libs\js\nspr\lib&quot;"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"

8
w32/vsnet/GetLibs.vbs
View File

@ -716,6 +716,10 @@ Sub BuildLibs_SpiderMonkey(BuildDebug, BuildRelease)
If Not FSO.FileExists(LibDestDir & "js\src\Debug\js32.dll") Then
BuildViaVCBuild LibDestDir & "js\src\fdlibm\fdlibm.vcproj", "Debug"
BuildViaVCBuild LibDestDir & "js\src\js.vcproj", "Debug"
FSO.CopyFile LibDestDir & "js\src\Debug\js32.dll", ScriptDir & "Debug\", True
FSO.CopyFile LibDestDir & "js\nspr\lib\libnspr4.dll", ScriptDir & "Debug\", True
FSO.CopyFile LibDestDir & "js\nspr\lib\libplc4.dll", ScriptDir & "Debug\", True
FSO.CopyFile LibDestDir & "js\nspr\lib\libplds4.dll", ScriptDir & "Debug\", True
End If
End If
If BuildRelease Then
@ -723,6 +727,10 @@ Sub BuildLibs_SpiderMonkey(BuildDebug, BuildRelease)
If Not FSO.FileExists(LibDestDir & "js\src\Release\js32.dll") Then
BuildViaVCBuild LibDestDir & "js\src\fdlibm\fdlibm.vcproj", "Release"
BuildViaVCBuild LibDestDir & "js\src\js.vcproj", "Release"
FSO.CopyFile LibDestDir & "js\src\Release\js32.dll", ScriptDir & "Release\", True
FSO.CopyFile LibDestDir & "js\nspr\lib\libnspr4.dll", ScriptDir & "Release\", True
FSO.CopyFile LibDestDir & "js\nspr\lib\libplc4.dll", ScriptDir & "Release\", True
FSO.CopyFile LibDestDir & "js\nspr\lib\libplds4.dll", ScriptDir & "Release\", True
End If
End If
Else