From: Michael Jerris <mike@jerris.com>
Date: Fri, 3 Mar 2006 08:24:25 +0000 (+0000)
Subject: fix mod_spidermonkey load on windows
X-Git-Tag: v1.0-beta1~3138
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a73ef856cfcc39db290f8f5768e1879c674c462b;p=thirdparty%2Ffreeswitch.git

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 f3cf56563d..adc6615822 100644
--- a/libs/libteletone/libteletone.vcproj
+++ b/libs/libteletone/libteletone.vcproj
@@ -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"
 			/>
diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.vcproj b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.vcproj
index bef23cd5e2..17bd7fe035 100644
--- a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.vcproj
+++ b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.vcproj
@@ -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"
diff --git a/w32/vsnet/GetLibs.vbs b/w32/vsnet/GetLibs.vbs
index d64bf92323..f6edfaecd5 100644
--- 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 
 				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