fix mod_spidermonkey load on windows

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@738 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/libs/libteletone/libteletone.vcproj b/libs/libteletone/libteletone.vcproj
index f3cf56563dcf92f90dc746da972f694d968519e0..adc6615822c8737b79a8d6d4c79357e99e359526 100644 (file)
--- a/libs/libteletone/libteletone.vcproj
+++ b/libs/libteletone/libteletone.vcproj
@@ -19,7 +19,7 @@
                        Name="Debug|Win32"\r
                        OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
                        IntermediateDirectory="$(ConfigurationName)"\r
-                       ConfigurationType="4"\r
+                       ConfigurationType="2"\r
                        CharacterSet="1"\r
                        >\r
                        <Tool\r
@@ -61,11 +61,17 @@
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
-                               Name="VCLibrarianTool"\r
+                               Name="VCLinkerTool"\r
+                               OptimizeReferences="1"\r
+                               EnableCOMDATFolding="1"\r
+                               OptimizeForWindows98="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
@@ -75,6 +81,12 @@
                        <Tool\r
                                Name="VCFxCopTool"\r
                        />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
@@ -83,7 +95,7 @@
                        Name="Release|Win32"\r
                        OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
                        IntermediateDirectory="$(ConfigurationName)"\r
-                       ConfigurationType="4"\r
+                       ConfigurationType="2"\r
                        CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
@@ -123,11 +135,14 @@
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
-                               Name="VCLibrarianTool"\r
+                               Name="VCLinkerTool"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
@@ -137,6 +152,12 @@
                        <Tool\r
                                Name="VCFxCopTool"\r
                        />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r

diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.vcproj b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.vcproj
index bef23cd5e201a565674556fa521e6ab972b3ab01..17bd7fe035915cdb5a18e61e8c19e252148bd2db 100644 (file)
--- a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.vcproj
+++ b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.vcproj
@@ -64,10 +64,10 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="js32.lib  curllib.lib ws2_32.lib winmm.lib sqlite.lib"\r
+                               AdditionalDependencies="js32.lib  curllib.lib ws2_32.lib winmm.lib sqlite.lib fdlibm.lib libnspr4.lib libplc4.lib  libplds4.lib"\r
                                OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_spidermonkey.dll"\r
                                LinkIncremental="2"\r
-                               AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\js\src\Debug&quot;;&quot;$(InputDir)..\..\..\..\libs\curl\lib\Debug&quot;;&quot;$(InputDir)..\..\..\..\libs\sqlite\Debug&quot;"\r
+                               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;"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(OutDir)/mod_spidermonkey.pdb"\r
                                SubSystem="2"\r
@@ -145,10 +145,10 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="js32.lib  curllib.lib ws2_32.lib winmm.lib sqlite.lib"\r
+                               AdditionalDependencies="js32.lib  curllib.lib ws2_32.lib winmm.lib sqlite.lib fdlibm.lib libnspr4.lib libplc4.lib  libplds4.lib"\r
                                OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_spidermonkey.dll"\r
                                LinkIncremental="1"\r
-                               AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\js\Release&quot;;&quot;$(InputDir)..\..\..\..\libs\curl\lib\Release&quot;;&quot;$(InputDir)..\..\..\..\libs\sqlite\Release&quot;"\r
+                               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;"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r

diff --git a/w32/vsnet/GetLibs.vbs b/w32/vsnet/GetLibs.vbs
index d64bf923230894722e416f0bbb24f8a394cba8d4..f6edfaecd50970d44f06cdb5ece044a894a5e233 100644 (file)
--- a/w32/vsnet/GetLibs.vbs
+++ b/w32/vsnet/GetLibs.vbs
@@ -716,6 +716,10 @@ Sub BuildLibs_SpiderMonkey(BuildDebug, BuildRelease)
                        If Not FSO.FileExists(LibDestDir & "js\src\Debug\js32.dll") Then \r
                                BuildViaVCBuild LibDestDir & "js\src\fdlibm\fdlibm.vcproj", "Debug"\r
                                BuildViaVCBuild LibDestDir & "js\src\js.vcproj", "Debug"\r
+                               FSO.CopyFile LibDestDir & "js\src\Debug\js32.dll", ScriptDir & "Debug\", True\r
+                               FSO.CopyFile LibDestDir & "js\nspr\lib\libnspr4.dll", ScriptDir & "Debug\", True\r
+                               FSO.CopyFile LibDestDir & "js\nspr\lib\libplc4.dll", ScriptDir & "Debug\", True\r
+                               FSO.CopyFile LibDestDir & "js\nspr\lib\libplds4.dll", ScriptDir & "Debug\", True\r
                        End If\r
                End If\r
                If BuildRelease Then\r
@@ -723,6 +727,10 @@ Sub BuildLibs_SpiderMonkey(BuildDebug, BuildRelease)
                        If Not FSO.FileExists(LibDestDir & "js\src\Release\js32.dll") Then \r
                                BuildViaVCBuild LibDestDir & "js\src\fdlibm\fdlibm.vcproj", "Release"\r
                                BuildViaVCBuild LibDestDir & "js\src\js.vcproj", "Release"\r
+                               FSO.CopyFile LibDestDir & "js\src\Release\js32.dll", ScriptDir & "Release\", True\r
+                               FSO.CopyFile LibDestDir & "js\nspr\lib\libnspr4.dll", ScriptDir & "Release\", True\r
+                               FSO.CopyFile LibDestDir & "js\nspr\lib\libplc4.dll", ScriptDir & "Release\", True\r
+                               FSO.CopyFile LibDestDir & "js\nspr\lib\libplds4.dll", ScriptDir & "Release\", True\r
                        End If\r
                End If\r
        Else\r