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

Win32 build fixups. 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@841 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2006-03-12 00:47:28 +00:00
parent 7cc9675f90
commit 2072392261
2 changed files with 62 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mod/codecs/mod_gsm/mod_gsm.vcproj
View File

@ -67,7 +67,7 @@
AdditionalDependencies="libgsm.lib FreeSwitchCore.lib" AdditionalDependencies="libgsm.lib FreeSwitchCore.lib"
OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_gsm.dll" OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_gsm.dll"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="..\..\..\..\libs\codec\gsm\Debug;"$(OutDir)"" AdditionalLibraryDirectories="..\..\..\..\libs\codec\gsm\$(OutDir);..\..\..\..\w32\vsnet\$(OutDir)"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/mod_gsm.pdb" ProgramDatabaseFile="$(OutDir)/mod_gsm.pdb"
SubSystem="2" SubSystem="2"
@ -147,7 +147,7 @@
AdditionalDependencies="libgsm.lib FreeSwitchCore.lib" AdditionalDependencies="libgsm.lib FreeSwitchCore.lib"
OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_gsm.dll" OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_gsm.dll"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="..\..\..\..\libs\codec\gsm\Release;$(OutDir)" AdditionalLibraryDirectories="..\..\..\..\libs\codec\gsm\$(OutDir);..\..\..\..\w32\vsnet\$(OutDir)"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
OptimizeReferences="2" OptimizeReferences="2"

87
w32/vsnet/GetLibs.vbs
View File

@ -41,6 +41,8 @@ If objArgs.Count >=1 Then
GetVCBuild GetVCBuild
Wscript.echo "Detected VCBuild: " & VCBuild Wscript.echo "Detected VCBuild: " & VCBuild
End If End If
Else
GetTarGZObjects UtilsDir
End If End If
' ************** ' **************
@ -979,46 +981,77 @@ Sub GetTarGZObjects(DestFolder)
If Right(DestFolder, 1) <> "\" Then DestFolder = DestFolder & "\" End If If Right(DestFolder, 1) <> "\" Then DestFolder = DestFolder & "\" End If
If Not FSO.FileExists(DestFolder & "XTar.dll") Then If Not FSO.FileExists(DestFolder & "7za.exe") Then
Wget ToolsBase & "XTar.dll", DestFolder Wget ToolsBase & "7za.exe", DestFolder
End If End If
If Not FSO.FileExists(DestFolder & "XGZip.dll") Then ' If Not FSO.FileExists(DestFolder & "XTar.dll") Then
Wget ToolsBase & "XGZip.dll", DestFolder ' Wget ToolsBase & "XTar.dll", DestFolder
End If ' End If
If Not FSO.FileExists(DestFolder & "XZip.dll") Then
Wget ToolsBase & "XZip.dll", DestFolder
End If
WshShell.Run "regsvr32 /s " & DestFolder & "XTar.dll", 6, True
WshShell.Run "regsvr32 /s " & DestFolder & "XGZip.dll", 6, True
WshShell.Run "regsvr32 /s " & DestFolder & "XZip.dll", 6, True ' If Not FSO.FileExists(DestFolder & "XGZip.dll") Then
' Wget ToolsBase & "XGZip.dll", DestFolder
' End If
' If Not FSO.FileExists(DestFolder & "XZip.dll") Then
' Wget ToolsBase & "XZip.dll", DestFolder
' End If
' WshShell.Run "regsvr32 /s " & DestFolder & "XTar.dll", 6, True
' WshShell.Run "regsvr32 /s " & DestFolder & "XGZip.dll", 6, True
'WshShell.Run "regsvr32 /s " & DestFolder & "XZip.dll", 6, True
End Sub End Sub
Sub UnTarGZ(TGZfile, DestFolder) Sub UnTarGZ(TGZfile, DestFolder)
Set objTAR = WScript.CreateObject("XStandard.TAR")
Set objGZip = WScript.CreateObject("XStandard.GZip")
wscript.echo("Extracting: " & TGZfile) wscript.echo("Extracting: " & TGZfile)
objGZip.Decompress TGZfile, Destfolder ' Set objTAR = WScript.CreateObject("XStandard.TAR")
objTAR.UnPack Left(TGZfile, Len(TGZfile)-3), Destfolder ' Set objGZip = WScript.CreateObject("XStandard.GZip")
' objGZip.Decompress TGZfile, Destfolder
' objTAR.UnPack Left(TGZfile, Len(TGZfile)-3), Destfolder
' Set objTAR = Nothing
' Set objGZip = Nothing
' WScript.Sleep(500)
Set MyFile = fso.CreateTextFile(UtilsDir & "tmpcmd.Bat", True)
MyFile.WriteLine("@" & UtilsDir & "7za.exe x " & TGZfile & " -y -o" & DestFolder)
MyFile.Close
Set oExec = WshShell.Exec(UtilsDir & "tmpcmd.Bat")
Do
WScript.Echo OExec.StdOut.ReadLine()
Loop While Not OExec.StdOut.atEndOfStream
If FSO.FileExists(Left(TGZfile, Len(TGZfile)-3)) Then
Set MyFile = fso.CreateTextFile(UtilsDir & "tmpcmd.Bat", True)
MyFile.WriteLine("@" & UtilsDir & "7za.exe x " & Left(TGZfile, Len(TGZfile)-3) & " -y -o" & DestFolder)
MyFile.Close
Set oExec = WshShell.Exec(UtilsDir & "tmpcmd.Bat")
Do
WScript.Echo OExec.StdOut.ReadLine()
Loop While Not OExec.StdOut.atEndOfStream
WScript.Sleep(500)
FSO.DeleteFile Left(TGZfile, Len(TGZfile)-3) ,true
End If
Set objTAR = Nothing
Set objGZip = Nothing
WScript.Sleep(500)
End Sub End Sub
Sub UnZip(Zipfile, DestFolder) Sub UnZip(Zipfile, DestFolder)
Dim objZip ' Dim objZip
Set objZip = WScript.CreateObject("XStandard.Zip") ' Set objZip = WScript.CreateObject("XStandard.Zip")
wscript.echo("Extracting: " & Zipfile) ' wscript.echo("Extracting: " & Zipfile)
objZip.UnPack Zipfile, DestFolder ' objZip.UnPack Zipfile, DestFolder
Set objZip = Nothing ' Set objZip = Nothing
' WScript.Sleep(500)
Set MyFile = fso.CreateTextFile(UtilsDir & "tmpcmd.Bat", True)
MyFile.WriteLine("@" & UtilsDir & "7za.exe x " & Zipfile & " -y -o" & DestFolder)
MyFile.Close
Set oExec = WshShell.Exec(UtilsDir & "tmpcmd.Bat")
Do
WScript.Echo OExec.StdOut.ReadLine()
Loop While Not OExec.StdOut.atEndOfStream
WScript.Sleep(500) WScript.Sleep(500)
End Sub End Sub