Skip to content

F
freeswitch
提交 d5945f81 authored 作者: Michael Jerris's avatar Michael Jerris
浏览文件
操作

add libresample to core libs in msvc build, rework GetLibs.vbs to be more… 

add libresample to core libs in msvc build, rework GetLibs.vbs to be more sensible in it's structure, change jrtp4c build in msvc to build as part of mod_exosip instead of as a separate lib for build simplicity, squash numerous warnings in libiax2 and jrtp4c, delete FreeswitchPlusLibs.sln because we were not using it and not maintaining it.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@250 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 3613ec26
显示空白字符变更
内嵌 并排
正在显示 包含 210 行增加 和 425 行删除
libs/iax/src/iax.c
浏览文件 @ d5945f81
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#if defined(_MSC_VER) #if defined(_MSC_VER)
#define close _close #define close _close
#define inline __inline #define inline __inline
#define strdup _strdup
#endif #endif
void gettimeofday(struct timeval *tv, void /*struct timezone*/ *tz); void gettimeofday(struct timeval *tv, void /*struct timezone*/ *tz);
...@@ -567,7 +568,7 @@ int iax_get_netstats(struct iax_session *session, int *rtt, struct iax_netstat * ...@@ -567,7 +568,7 @@ int iax_get_netstats(struct iax_session *session, int *rtt, struct iax_netstat *
static int calc_timestamp(struct iax_session *session, unsigned int ts, struct ast_frame *f) static int calc_timestamp(struct iax_session *session, unsigned int ts, struct ast_frame *f)
{ {
int ms; unsigned int ms;
time_in_ms_t time_in_ms; time_in_ms_t time_in_ms;
int voice = 0; int voice = 0;
int genuine = 0; int genuine = 0;
...@@ -926,7 +927,7 @@ int iax_init(int preferredportno) ...@@ -926,7 +927,7 @@ int iax_init(int preferredportno)
DEBU(G "Already initialized."); DEBU(G "Already initialized.");
return 0; return 0;
} }
netfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_IP); netfd = (int)socket(AF_INET, SOCK_DGRAM, IPPROTO_IP);
if (netfd < 0) { if (netfd < 0) {
DEBU(G "Unable to allocate UDP socket\n"); DEBU(G "Unable to allocate UDP socket\n");
IAXERROR "Unable to allocate UDP socket\n"); IAXERROR "Unable to allocate UDP socket\n");
...@@ -976,7 +977,7 @@ int iax_init(int preferredportno) ...@@ -976,7 +977,7 @@ int iax_init(int preferredportno)
#endif #endif
portno = ntohs(sin.sin_port); portno = ntohs(sin.sin_port);
} }
srand(time(NULL)); srand((unsigned int)time(NULL));
callnums = rand() % 32767 + 1; callnums = rand() % 32767 + 1;
transfer_id = rand() % 32767 + 1; transfer_id = rand() % 32767 + 1;
DEBU(G "Started on port %d\n", portno); DEBU(G "Started on port %d\n", portno);
...@@ -1609,7 +1610,7 @@ int iax_hangup(struct iax_session *session, char *byemsg) ...@@ -1609,7 +1610,7 @@ int iax_hangup(struct iax_session *session, char *byemsg)
int iax_sendurl(struct iax_session *session, char *url) int iax_sendurl(struct iax_session *session, char *url)
{ {
return send_command(session, AST_FRAME_HTML, AST_HTML_URL, 0, (unsigned char *) url, strlen(url), -1); return send_command(session, AST_FRAME_HTML, AST_HTML_URL, 0, (unsigned char *) url, (int)strlen(url), -1);
} }
int iax_ring_announce(struct iax_session *session) int iax_ring_announce(struct iax_session *session)
...@@ -1653,12 +1654,12 @@ int iax_load_complete(struct iax_session *session) ...@@ -1653,12 +1654,12 @@ int iax_load_complete(struct iax_session *session)
int iax_send_url(struct iax_session *session, char *url, int link) int iax_send_url(struct iax_session *session, char *url, int link)
{ {
return send_command(session, AST_FRAME_HTML, link ? AST_HTML_LINKURL : AST_HTML_URL, 0, (unsigned char *) url, strlen(url), -1); return send_command(session, AST_FRAME_HTML, link ? AST_HTML_LINKURL : AST_HTML_URL, 0, (unsigned char *) url, (int)strlen(url), -1);
} }
int iax_send_text(struct iax_session *session, char *text) int iax_send_text(struct iax_session *session, char *text)
{ {
return send_command(session, AST_FRAME_TEXT, 0, 0, (unsigned char *) text, strlen(text) + 1, -1); return send_command(session, AST_FRAME_TEXT, 0, 0, (unsigned char *) text, (int)strlen(text) + 1, -1);
} }
int iax_send_unlink(struct iax_session *session) int iax_send_unlink(struct iax_session *session)
...@@ -1687,7 +1688,7 @@ static int iax_send_pong(struct iax_session *session, unsigned int ts) ...@@ -1687,7 +1688,7 @@ static int iax_send_pong(struct iax_session *session, unsigned int ts)
iax_ie_append_int(&ied,IAX_IE_RR_LOSS, iax_ie_append_int(&ied,IAX_IE_RR_LOSS,
((0xff & (stats.losspct/1000)) << 24 | (stats.frames_lost & 0x00ffffff))); ((0xff & (stats.losspct/1000)) << 24 | (stats.frames_lost & 0x00ffffff)));
iax_ie_append_int(&ied,IAX_IE_RR_PKTS, stats.frames_in); iax_ie_append_int(&ied,IAX_IE_RR_PKTS, stats.frames_in);
iax_ie_append_short(&ied,IAX_IE_RR_DELAY, stats.current - stats.min); iax_ie_append_short(&ied,IAX_IE_RR_DELAY, (unsigned short)(stats.current - stats.min));
iax_ie_append_int(&ied,IAX_IE_RR_DROPPED, stats.frames_dropped); iax_ie_append_int(&ied,IAX_IE_RR_DROPPED, stats.frames_dropped);
iax_ie_append_int(&ied,IAX_IE_RR_OOO, stats.frames_ooo); iax_ie_append_int(&ied,IAX_IE_RR_OOO, stats.frames_ooo);
} }
...@@ -1767,8 +1768,8 @@ int iax_auth_reply(struct iax_session *session, char *password, char *challenge, ...@@ -1767,8 +1768,8 @@ int iax_auth_reply(struct iax_session *session, char *password, char *challenge,
memset(&ied, 0, sizeof(ied)); memset(&ied, 0, sizeof(ied));
if ((methods & IAX_AUTH_MD5) && challenge) { if ((methods & IAX_AUTH_MD5) && challenge) {
MD5Init(&md5); MD5Init(&md5);
MD5Update(&md5, (const unsigned char *) challenge, strlen(challenge)); MD5Update(&md5, (const unsigned char *) challenge, (unsigned int)strlen(challenge));
MD5Update(&md5, (const unsigned char *) password, strlen(password)); MD5Update(&md5, (const unsigned char *) password, (unsigned int)strlen(password));
MD5Final((unsigned char *) reply, &md5); MD5Final((unsigned char *) reply, &md5);
memset(realreply, 0, sizeof(realreply)); memset(realreply, 0, sizeof(realreply));
convert_reply(realreply, (unsigned char *) reply); convert_reply(realreply, (unsigned char *) reply);
...@@ -1790,8 +1791,8 @@ static int iax_regauth_reply(struct iax_session *session, char *password, char * ...@@ -1790,8 +1791,8 @@ static int iax_regauth_reply(struct iax_session *session, char *password, char *
iax_ie_append_short(&ied, IAX_IE_REFRESH, session->refresh); iax_ie_append_short(&ied, IAX_IE_REFRESH, session->refresh);
if ((methods & IAX_AUTHMETHOD_MD5) && challenge) { if ((methods & IAX_AUTHMETHOD_MD5) && challenge) {
MD5Init(&md5); MD5Init(&md5);
MD5Update(&md5, (const unsigned char *) challenge, strlen(challenge)); MD5Update(&md5, (const unsigned char *) challenge, (unsigned int)strlen(challenge));
MD5Update(&md5, (const unsigned char *) password, strlen(password)); MD5Update(&md5, (const unsigned char *) password, (unsigned int)strlen(password));
MD5Final((unsigned char *) reply, &md5); MD5Final((unsigned char *) reply, &md5);
memset(realreply, 0, sizeof(realreply)); memset(realreply, 0, sizeof(realreply));
convert_reply(realreply, (unsigned char *) reply); convert_reply(realreply, (unsigned char *) reply);
...@@ -1852,7 +1853,7 @@ char iax_pref_codec_add(struct iax_session *session, unsigned int format) ...@@ -1852,7 +1853,7 @@ char iax_pref_codec_add(struct iax_session *session, unsigned int format)
void iax_pref_codec_del(struct iax_session *session, unsigned int format) void iax_pref_codec_del(struct iax_session *session, unsigned int format)
{ {
int diff = (int) 'A'; int diff = (int) 'A';
int x; size_t x;
char old[32]; char old[32];
char remove = which_bit(format) + diff; char remove = which_bit(format) + diff;
...@@ -2539,7 +2540,7 @@ static struct iax_event *iax_header_to_event(struct iax_session *session, ...@@ -2539,7 +2540,7 @@ static struct iax_event *iax_header_to_event(struct iax_session *session,
session->capability = e->ies.capability; session->capability = e->ies.capability;
if (e->ies.codec_prefs) { if (e->ies.codec_prefs) {
strncpy(session->codec_order, e->ies.codec_prefs, sizeof(session->codec_order)); strncpy(session->codec_order, e->ies.codec_prefs, sizeof(session->codec_order));
session->codec_order_len = strlen(session->codec_order); session->codec_order_len = (int)strlen(session->codec_order);
} }
e->etype = IAX_EVENT_CONNECT; e->etype = IAX_EVENT_CONNECT;
e = schedule_delivery(e, ts, updatehistory); e = schedule_delivery(e, ts, updatehistory);
......
libs/iax/src/iax2-parser.c
浏览文件 @ d5945f81
...@@ -239,21 +239,21 @@ static void dump_prov_ies(char *output, int maxlen, unsigned char *iedata, int l ...@@ -239,21 +239,21 @@ static void dump_prov_ies(char *output, int maxlen, unsigned char *iedata, int l
if (len < 2) if (len < 2)
return; return;
strcpy(output, "\n"); strcpy(output, "\n");
maxlen -= strlen(output); output += strlen(output); maxlen -= (int)strlen(output); output += strlen(output);
while(len > 2) { while(len > 2) {
ie = iedata[0]; ie = iedata[0];
ielen = iedata[1]; ielen = iedata[1];
if (ielen + 2> len) { if (ielen + 2> len) {
snprintf(tmp, (int)sizeof(tmp), "Total Prov IE length of %d bytes exceeds remaining prov frame length of %d bytes\n", ielen + 2, len); snprintf(tmp, (int)sizeof(tmp), "Total Prov IE length of %d bytes exceeds remaining prov frame length of %d bytes\n", ielen + 2, len);
strncpy(output, tmp, maxlen - 1); strncpy(output, tmp, maxlen - 1);
maxlen -= strlen(output); output += strlen(output); maxlen -= (int)strlen(output); output += strlen(output);
return; return;
} }
found = 0; found = 0;
if (!found) { if (!found) {
snprintf(tmp, (int)sizeof(tmp), " Unknown Prov IE %03d : Present\n", ie); snprintf(tmp, (int)sizeof(tmp), " Unknown Prov IE %03d : Present\n", ie);
strncpy(output, tmp, maxlen - 1); strncpy(output, tmp, maxlen - 1);
maxlen -= strlen(output); output += strlen(output); maxlen -= (int)strlen(output); output += strlen(output);
} }
iedata += (2 + ielen); iedata += (2 + ielen);
len -= (2 + ielen); len -= (2 + ielen);
...@@ -467,7 +467,7 @@ int iax_ie_append_short(struct iax_ie_data *ied, unsigned char ie, unsigned shor ...@@ -467,7 +467,7 @@ int iax_ie_append_short(struct iax_ie_data *ied, unsigned char ie, unsigned shor
int iax_ie_append_str(struct iax_ie_data *ied, unsigned char ie, unsigned char *str) int iax_ie_append_str(struct iax_ie_data *ied, unsigned char ie, unsigned char *str)
{ {
return iax_ie_append_raw(ied, ie, str, strlen((char *) str)); return iax_ie_append_raw(ied, ie, str, (int)strlen((char *) str));
} }
int iax_ie_append_byte(struct iax_ie_data *ied, unsigned char ie, unsigned char dat) int iax_ie_append_byte(struct iax_ie_data *ied, unsigned char ie, unsigned char dat)
......
libs/jrtp4c/src/jrtp4c.cpp
浏览文件 @ d5945f81
...@@ -130,7 +130,7 @@ extern "C" { ...@@ -130,7 +130,7 @@ extern "C" {
if ((pack = jrtp4c->session->GetNextPacket())) { if ((pack = jrtp4c->session->GetNextPacket())) {
slen = pack->GetPayloadLength(); slen = (int)pack->GetPayloadLength();
if (slen > datalen) { if (slen > datalen) {
slen = datalen; slen = datalen;
......
libs/jrtp4c/src/jrtp4c.h
浏览文件 @ d5945f81
...@@ -6,6 +6,14 @@ ...@@ -6,6 +6,14 @@
#ifndef CCRTP4C_H #ifndef CCRTP4C_H
#define CCRTP4C_H #define CCRTP4C_H
#ifdef WIN32
#include <winsock2.h>
#pragma warning(disable: 4267)
#else
#include <netinet/in.h>
#include <arpa/inet.h>
#endif // WIN32
#ifdef __cplusplus #ifdef __cplusplus
#include <rtpsession.h> #include <rtpsession.h>
#include <rtppacket.h> #include <rtppacket.h>
...@@ -13,18 +21,6 @@ ...@@ -13,18 +21,6 @@
#include <rtpipv4address.h> #include <rtpipv4address.h>
#include <rtpsessionparams.h> #include <rtpsessionparams.h>
#include <rtperrors.h> #include <rtperrors.h>
#ifndef WIN32
#include <netinet/in.h>
#include <arpa/inet.h>
#else
#include <winsock2.h>
#endif // WIN32
#if 0
#include <stdlib.h>
#include <stdio.h>
#include <iostream>
#include <string>
#endif
extern "C" { extern "C" {
#endif #endif
......
src/mod/mod_exosip/mod_exosip.vcproj
浏览文件 @ d5945f81
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/D _CRT_SECURE_NO_DEPRECATE" AdditionalOptions="/D _CRT_SECURE_NO_DEPRECATE"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\..\include;..\..\..\libs\include;..\..\..\libs\libeXosip2\include;..\..\..\libs\osip\include;..\..\..\libs\jrtp4c\src;..\..\..\libs\osip\src\osipparser2" AdditionalIncludeDirectories="..\..\include;..\..\..\libs\include;..\..\..\libs\libeXosip2\include;..\..\..\libs\osip\include;..\..\..\libs\jrtp4c\src;..\..\..\libs\osip\src\osipparser2;..\..\..\libs\jrtplib\src;&quot;..\..\..\libs\jthread-1.1.2\src&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
GeneratePreprocessedFile="0" GeneratePreprocessedFile="0"
MinimalRebuild="true" MinimalRebuild="true"
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="/NODEFAULTLIB:LIBCMT" AdditionalOptions="/NODEFAULTLIB:LIBCMT"
AdditionalDependencies="Ws2_32.lib Iphlpapi.lib libcpmt.lib eXosip.lib jrtp4c.lib jrtplib.lib jthread.lib osipparser2.lib osip2.lib" AdditionalDependencies="Ws2_32.lib Iphlpapi.lib libcpmt.lib eXosip.lib jrtplib.lib jthread.lib osipparser2.lib osip2.lib"
ShowProgress="0" ShowProgress="0"
OutputFile="..\..\..\w32\vsnet\$(OutDir)/mod/mod_exosip.dll" OutputFile="..\..\..\w32\vsnet\$(OutDir)/mod/mod_exosip.dll"
LinkIncremental="2" LinkIncremental="2"
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\include;..\..\..\libs\include;..\..\..\libs\libeXosip2\include;..\..\..\libs\osip\include;..\..\..\libs\jrtp4c\src;..\..\..\libs\osip\src\osipparser2" AdditionalIncludeDirectories="..\..\include;..\..\..\libs\include;..\..\..\libs\libeXosip2\include;..\..\..\libs\osip\include;..\..\..\libs\jrtp4c\src;..\..\..\libs\osip\src\osipparser2;..\..\..\libs\jrtplib\src;&quot;..\..\..\libs\jthread-1.1.2\src&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
RuntimeLibrary="0" RuntimeLibrary="0"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="Ws2_32.lib Iphlpapi.lib libcpmt.lib eXosip.lib jrtp4c.lib jrtplib.lib jthread.lib osipparser2.lib osip2.lib" AdditionalDependencies="Ws2_32.lib Iphlpapi.lib libcpmt.lib eXosip.lib jrtplib.lib jthread.lib osipparser2.lib osip2.lib"
OutputFile="..\..\..\w32\vsnet\$(OutDir)/mod/mod_exosip.dll" OutputFile="..\..\..\w32\vsnet\$(OutDir)/mod/mod_exosip.dll"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\libs\apr\Release&quot;;&quot;$(InputDir)..\..\..\libs\jrtp4c\w32\Release&quot;;&quot;$(InputDir)..\..\..\libs\jrtplib\Release&quot;;&quot;$(InputDir)..\..\..\libs\jthread-1.1.2\Release&quot;;&quot;$(InputDir)..\..\..\libs\libeXosip2\platform\vsnet\Release&quot;;&quot;$(InputDir)..\..\..\libs\osip\platform\vsnet\Release&quot;" AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\libs\apr\Release&quot;;&quot;$(InputDir)..\..\..\libs\jrtp4c\w32\Release&quot;;&quot;$(InputDir)..\..\..\libs\jrtplib\Release&quot;;&quot;$(InputDir)..\..\..\libs\jthread-1.1.2\Release&quot;;&quot;$(InputDir)..\..\..\libs\libeXosip2\platform\vsnet\Release&quot;;&quot;$(InputDir)..\..\..\libs\osip\platform\vsnet\Release&quot;"
...@@ -194,6 +194,10 @@ ...@@ -194,6 +194,10 @@
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
> >
<File
RelativePath="..\..\..\libs\jrtp4c\src\jrtp4c.cpp"
>
</File>
<File <File
RelativePath=".\mod_exosip.c" RelativePath=".\mod_exosip.c"
> >
......
w32/vsnet/FreeSwitchCore.vcproj
浏览文件 @ d5945f81
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\..\src\include;..\..\libs\apr\include;&quot;..\..\libs\apr-util\include&quot;;..\..\libs\sqlite" AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;APR_DECLARE_EXPORT;APU_DECLARE_EXPORT;API_DECLARE_EXPORT" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;APR_DECLARE_EXPORT;APU_DECLARE_EXPORT;API_DECLARE_EXPORT"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
...@@ -63,10 +63,10 @@ ...@@ -63,10 +63,10 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="Ws2_32.lib Mswsock.lib apr-1.lib sqlite.lib apriconv-1.lib aprutil-1.lib xml.lib Rpcrt4.lib" AdditionalDependencies="Ws2_32.lib Mswsock.lib apr-1.lib sqlite.lib apriconv-1.lib aprutil-1.lib xml.lib Rpcrt4.lib libresampled.lib"
OutputFile="$(OutDir)/FreeSwitch.dll" OutputFile="$(OutDir)/FreeSwitch.dll"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="&quot;$(InputDir)..\..\libs\apr\Debug&quot;;&quot;$(InputDir)..\..\libs\apr\LibD&quot;;&quot;$(InputDir)..\..\libs\sqlite\Debug&quot;;&quot;$(InputDir)..\..\libs\apr-util\LibD&quot;;&quot;$(InputDir)..\..\libs\apr-util\xml\expat\lib\LibD&quot;;&quot;$(InputDir)..\..\libs\apr-iconv\LibD&quot;" AdditionalLibraryDirectories="&quot;$(InputDir)..\..\libs\apr\Debug&quot;;&quot;$(InputDir)..\..\libs\apr\LibD&quot;;&quot;$(InputDir)..\..\libs\sqlite\Debug&quot;;&quot;$(InputDir)..\..\libs\apr-util\LibD&quot;;&quot;$(InputDir)..\..\libs\apr-util\xml\expat\lib\LibD&quot;;&quot;$(InputDir)..\..\libs\apr-iconv\LibD&quot;;&quot;$(InputDir)..\..\libs\libresample\win&quot;"
AddModuleNamesToAssembly="" AddModuleNamesToAssembly=""
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/FreeSwitchCore.pdb" ProgramDatabaseFile="$(OutDir)/FreeSwitchCore.pdb"
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\src\include;..\..\libs\apr\include;&quot;..\..\libs\apr-util\include&quot;;..\..\libs\sqlite" AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;APR_DECLARE_EXPORT;APU_DECLARE_EXPORT;API_DECLARE_EXPORT" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;APR_DECLARE_EXPORT;APU_DECLARE_EXPORT;API_DECLARE_EXPORT"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
...@@ -147,10 +147,10 @@ ...@@ -147,10 +147,10 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="Ws2_32.lib Mswsock.lib apr-1.lib sqlite.lib apriconv-1.lib aprutil-1.lib xml.lib Rpcrt4.lib" AdditionalDependencies="Ws2_32.lib Mswsock.lib apr-1.lib sqlite.lib apriconv-1.lib aprutil-1.lib xml.lib Rpcrt4.lib libresample.lib"
OutputFile="$(OutDir)/FreeSwitch.dll" OutputFile="$(OutDir)/FreeSwitch.dll"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="&quot;$(InputDir)..\..\libs\apr\Release&quot;;&quot;$(InputDir)..\..\libs\sqlite\Release&quot;;&quot;$(InputDir)..\..\libs\apr\LibR&quot;;&quot;$(InputDir)..\..\libs\apr-util\LibR&quot;;&quot;$(InputDir)..\..\libs\apr-iconv\LibR&quot;;&quot;$(InputDir)..\..\libs\apr-util\xml\expat\lib\LibR&quot;" AdditionalLibraryDirectories="&quot;$(InputDir)..\..\libs\apr\Release&quot;;&quot;$(InputDir)..\..\libs\sqlite\Release&quot;;&quot;$(InputDir)..\..\libs\apr\LibR&quot;;&quot;$(InputDir)..\..\libs\apr-util\LibR&quot;;&quot;$(InputDir)..\..\libs\apr-iconv\LibR&quot;;&quot;$(InputDir)..\..\libs\apr-util\xml\expat\lib\LibR&quot;;&quot;$(InputDir)..\..\libs\libresample\win&quot;"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
OptimizeReferences="2" OptimizeReferences="2"
......
w32/vsnet/FreeswitchPlusLibs.sln deleted 100644 → 0
浏览文件 @ 3613ec26

Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeSwitchConsole", "FreeSwitchConsole.vcproj", "{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}"
ProjectSection(ProjectDependencies) = postProject
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeSwitchCoreLib", "FreeSwitchCore.vcproj", "{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}"
ProjectSection(ProjectDependencies) = postProject
{13860EB7-038A-438F-898F-1032E42A5574} = {13860EB7-038A-438F-898F-1032E42A5574}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_bridgecall", "mod_bridgecall.vcproj", "{E1794405-29D4-466D-9BE3-DD2344C2A663}"
ProjectSection(ProjectDependencies) = postProject
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
{13860EB7-038A-438F-898F-1032E42A5574} = {13860EB7-038A-438F-898F-1032E42A5574}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_softtimer", "mod_softtimer.vcproj", "{DCC13474-28DF-47CA-A8EB-72F8CE9A78C5}"
ProjectSection(ProjectDependencies) = postProject
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
{13860EB7-038A-438F-898F-1032E42A5574} = {13860EB7-038A-438F-898F-1032E42A5574}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dialplan_demo", "mod_dialplan_demo.vcproj", "{2988EB83-785F-45D4-8731-8E1E4345177E}"
ProjectSection(ProjectDependencies) = postProject
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
{13860EB7-038A-438F-898F-1032E42A5574} = {13860EB7-038A-438F-898F-1032E42A5574}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_exosip", "mod_exosip.vcproj", "{45DF84ED-D24A-4FF6-B5B0-0A9A5FDB9552}"
ProjectSection(ProjectDependencies) = postProject
{85255507-5D16-4218-85E2-F683BB2F04DA} = {85255507-5D16-4218-85E2-F683BB2F04DA}
{E85B3E1F-B671-4E84-9F09-90F61A27D783} = {E85B3E1F-B671-4E84-9F09-90F61A27D783}
{4EA67539-9EE9-4065-BD39-87E517FD8262} = {4EA67539-9EE9-4065-BD39-87E517FD8262}
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
{44F46B7E-0E51-4304-9735-330DFBAB41E5} = {44F46B7E-0E51-4304-9735-330DFBAB41E5}
{13860EB7-038A-438F-898F-1032E42A5574} = {13860EB7-038A-438F-898F-1032E42A5574}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g711codec", "mod_g711codec.vcproj", "{B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}"
ProjectSection(ProjectDependencies) = postProject
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
{13860EB7-038A-438F-898F-1032E42A5574} = {13860EB7-038A-438F-898F-1032E42A5574}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_playback", "mod_playback.vcproj", "{78100236-7CEA-4948-96CC-E8ED3160329C}"
ProjectSection(ProjectDependencies) = postProject
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
{13860EB7-038A-438F-898F-1032E42A5574} = {13860EB7-038A-438F-898F-1032E42A5574}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_rawaudio", "mod_rawaudio.vcproj", "{5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}"
ProjectSection(ProjectDependencies) = postProject
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
{13860EB7-038A-438F-898F-1032E42A5574} = {13860EB7-038A-438F-898F-1032E42A5574}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_woomerachan", "mod_woomerachan.vcproj", "{FE3540C5-3303-46E0-A69E-D92F775687F1}"
ProjectSection(ProjectDependencies) = postProject
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
{13860EB7-038A-438F-898F-1032E42A5574} = {13860EB7-038A-438F-898F-1032E42A5574}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libapr", "..\..\libs\apr\libapr.vcproj", "{13860EB7-038A-438F-898F-1032E42A5574}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osip2", "..\..\libs\osip\platform\vsnet\osip2.vcproj", "{85255507-5D16-4218-85E2-F683BB2F04DA}"
ProjectSection(ProjectDependencies) = postProject
{44F46B7E-0E51-4304-9735-330DFBAB41E5} = {44F46B7E-0E51-4304-9735-330DFBAB41E5}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osipparser2", "..\..\libs\osip\platform\vsnet\osipparser2.vcproj", "{44F46B7E-0E51-4304-9735-330DFBAB41E5}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eXosip", "..\..\libs\libeXosip2\platform\vsnet\eXosip.vcproj", "{4EA67539-9EE9-4065-BD39-87E517FD8262}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jrtp4c", "..\..\libs\jrtp4c\w32\jrtp4c.vcproj", "{E85B3E1F-B671-4E84-9F09-90F61A27D783}"
ProjectSection(ProjectDependencies) = postProject
{4009F58A-E333-424B-A868-7E82804DD055} = {4009F58A-E333-424B-A868-7E82804DD055}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jthread", "..\..\libs\jthread-1.1.2\jthread.vcproj", "{96A714AE-BE53-4EFF-8569-C3809AD4F3B6}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jrtplib", "..\..\libs\jrtplib\jrtplib.vcproj", "{4009F58A-E333-424B-A868-7E82804DD055}"
ProjectSection(ProjectDependencies) = postProject
{96A714AE-BE53-4EFF-8569-C3809AD4F3B6} = {96A714AE-BE53-4EFF-8569-C3809AD4F3B6}
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "mod_exosip_deps", "mod_exosip_deps", "{40D9233D-E463-4DD6-AB34-47BC3BFBED19}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mod", "Mod", "{AC923B27-D665-490E-94F5-FA40E1607FB6}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}.Debug|Win32.ActiveCfg = Debug|Win32
{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}.Debug|Win32.Build.0 = Debug|Win32
{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}.Release|Win32.ActiveCfg = Release|Win32
{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}.Release|Win32.Build.0 = Release|Win32
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}.Debug|Win32.ActiveCfg = Debug|Win32
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}.Debug|Win32.Build.0 = Debug|Win32
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}.Release|Win32.ActiveCfg = Release|Win32
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}.Release|Win32.Build.0 = Release|Win32
{E1794405-29D4-466D-9BE3-DD2344C2A663}.Debug|Win32.ActiveCfg = Debug|Win32
{E1794405-29D4-466D-9BE3-DD2344C2A663}.Debug|Win32.Build.0 = Debug|Win32
{E1794405-29D4-466D-9BE3-DD2344C2A663}.Release|Win32.ActiveCfg = Release|Win32
{E1794405-29D4-466D-9BE3-DD2344C2A663}.Release|Win32.Build.0 = Release|Win32
{DCC13474-28DF-47CA-A8EB-72F8CE9A78C5}.Debug|Win32.ActiveCfg = Debug|Win32
{DCC13474-28DF-47CA-A8EB-72F8CE9A78C5}.Debug|Win32.Build.0 = Debug|Win32
{DCC13474-28DF-47CA-A8EB-72F8CE9A78C5}.Release|Win32.ActiveCfg = Release|Win32
{DCC13474-28DF-47CA-A8EB-72F8CE9A78C5}.Release|Win32.Build.0 = Release|Win32
{2988EB83-785F-45D4-8731-8E1E4345177E}.Debug|Win32.ActiveCfg = Debug|Win32
{2988EB83-785F-45D4-8731-8E1E4345177E}.Debug|Win32.Build.0 = Debug|Win32
{2988EB83-785F-45D4-8731-8E1E4345177E}.Release|Win32.ActiveCfg = Release|Win32
{2988EB83-785F-45D4-8731-8E1E4345177E}.Release|Win32.Build.0 = Release|Win32
{45DF84ED-D24A-4FF6-B5B0-0A9A5FDB9552}.Debug|Win32.ActiveCfg = Debug|Win32
{45DF84ED-D24A-4FF6-B5B0-0A9A5FDB9552}.Debug|Win32.Build.0 = Debug|Win32
{45DF84ED-D24A-4FF6-B5B0-0A9A5FDB9552}.Release|Win32.ActiveCfg = Release|Win32
{45DF84ED-D24A-4FF6-B5B0-0A9A5FDB9552}.Release|Win32.Build.0 = Release|Win32
{B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}.Debug|Win32.ActiveCfg = Debug|Win32
{B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}.Debug|Win32.Build.0 = Debug|Win32
{B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}.Release|Win32.ActiveCfg = Release|Win32
{B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}.Release|Win32.Build.0 = Release|Win32
{78100236-7CEA-4948-96CC-E8ED3160329C}.Debug|Win32.ActiveCfg = Debug|Win32
{78100236-7CEA-4948-96CC-E8ED3160329C}.Debug|Win32.Build.0 = Debug|Win32
{78100236-7CEA-4948-96CC-E8ED3160329C}.Release|Win32.ActiveCfg = Release|Win32
{78100236-7CEA-4948-96CC-E8ED3160329C}.Release|Win32.Build.0 = Release|Win32
{5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}.Debug|Win32.ActiveCfg = Debug|Win32
{5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}.Debug|Win32.Build.0 = Debug|Win32
{5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}.Release|Win32.ActiveCfg = Release|Win32
{5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}.Release|Win32.Build.0 = Release|Win32
{FE3540C5-3303-46E0-A69E-D92F775687F1}.Debug|Win32.ActiveCfg = Debug|Win32
{FE3540C5-3303-46E0-A69E-D92F775687F1}.Debug|Win32.Build.0 = Debug|Win32
{FE3540C5-3303-46E0-A69E-D92F775687F1}.Release|Win32.ActiveCfg = Release|Win32
{FE3540C5-3303-46E0-A69E-D92F775687F1}.Release|Win32.Build.0 = Release|Win32
{13860EB7-038A-438F-898F-1032E42A5574}.Debug|Win32.ActiveCfg = Debug|Win32
{13860EB7-038A-438F-898F-1032E42A5574}.Debug|Win32.Build.0 = Debug|Win32
{13860EB7-038A-438F-898F-1032E42A5574}.Release|Win32.ActiveCfg = Release|Win32
{13860EB7-038A-438F-898F-1032E42A5574}.Release|Win32.Build.0 = Release|Win32
{85255507-5D16-4218-85E2-F683BB2F04DA}.Debug|Win32.ActiveCfg = Debug|Win32
{85255507-5D16-4218-85E2-F683BB2F04DA}.Debug|Win32.Build.0 = Debug|Win32
{85255507-5D16-4218-85E2-F683BB2F04DA}.Release|Win32.ActiveCfg = Release|Win32
{85255507-5D16-4218-85E2-F683BB2F04DA}.Release|Win32.Build.0 = Release|Win32
{44F46B7E-0E51-4304-9735-330DFBAB41E5}.Debug|Win32.ActiveCfg = Debug|Win32
{44F46B7E-0E51-4304-9735-330DFBAB41E5}.Debug|Win32.Build.0 = Debug|Win32
{44F46B7E-0E51-4304-9735-330DFBAB41E5}.Release|Win32.ActiveCfg = Release|Win32
{44F46B7E-0E51-4304-9735-330DFBAB41E5}.Release|Win32.Build.0 = Release|Win32
{4EA67539-9EE9-4065-BD39-87E517FD8262}.Debug|Win32.ActiveCfg = Debug|Win32
{4EA67539-9EE9-4065-BD39-87E517FD8262}.Debug|Win32.Build.0 = Debug|Win32
{4EA67539-9EE9-4065-BD39-87E517FD8262}.Release|Win32.ActiveCfg = Release|Win32
{4EA67539-9EE9-4065-BD39-87E517FD8262}.Release|Win32.Build.0 = Release|Win32
{E85B3E1F-B671-4E84-9F09-90F61A27D783}.Debug|Win32.ActiveCfg = Debug|Win32
{E85B3E1F-B671-4E84-9F09-90F61A27D783}.Debug|Win32.Build.0 = Debug|Win32
{E85B3E1F-B671-4E84-9F09-90F61A27D783}.Release|Win32.ActiveCfg = Release|Win32
{E85B3E1F-B671-4E84-9F09-90F61A27D783}.Release|Win32.Build.0 = Release|Win32
{96A714AE-BE53-4EFF-8569-C3809AD4F3B6}.Debug|Win32.ActiveCfg = Debug|Win32
{96A714AE-BE53-4EFF-8569-C3809AD4F3B6}.Debug|Win32.Build.0 = Debug|Win32
{96A714AE-BE53-4EFF-8569-C3809AD4F3B6}.Release|Win32.ActiveCfg = Release|Win32
{96A714AE-BE53-4EFF-8569-C3809AD4F3B6}.Release|Win32.Build.0 = Release|Win32
{4009F58A-E333-424B-A868-7E82804DD055}.Debug|Win32.ActiveCfg = Debug|Win32
{4009F58A-E333-424B-A868-7E82804DD055}.Debug|Win32.Build.0 = Debug|Win32
{4009F58A-E333-424B-A868-7E82804DD055}.Release|Win32.ActiveCfg = Release|Win32
{4009F58A-E333-424B-A868-7E82804DD055}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{96A714AE-BE53-4EFF-8569-C3809AD4F3B6} = {40D9233D-E463-4DD6-AB34-47BC3BFBED19}
{E85B3E1F-B671-4E84-9F09-90F61A27D783} = {40D9233D-E463-4DD6-AB34-47BC3BFBED19}
{4009F58A-E333-424B-A868-7E82804DD055} = {40D9233D-E463-4DD6-AB34-47BC3BFBED19}
{4EA67539-9EE9-4065-BD39-87E517FD8262} = {40D9233D-E463-4DD6-AB34-47BC3BFBED19}
{85255507-5D16-4218-85E2-F683BB2F04DA} = {40D9233D-E463-4DD6-AB34-47BC3BFBED19}
{44F46B7E-0E51-4304-9735-330DFBAB41E5} = {40D9233D-E463-4DD6-AB34-47BC3BFBED19}
{E1794405-29D4-466D-9BE3-DD2344C2A663} = {AC923B27-D665-490E-94F5-FA40E1607FB6}
{FE3540C5-3303-46E0-A69E-D92F775687F1} = {AC923B27-D665-490E-94F5-FA40E1607FB6}
{2988EB83-785F-45D4-8731-8E1E4345177E} = {AC923B27-D665-490E-94F5-FA40E1607FB6}
{45DF84ED-D24A-4FF6-B5B0-0A9A5FDB9552} = {AC923B27-D665-490E-94F5-FA40E1607FB6}
{B1FE4613-3F4B-4DAF-9714-2472BF8F56AE} = {AC923B27-D665-490E-94F5-FA40E1607FB6}
{78100236-7CEA-4948-96CC-E8ED3160329C} = {AC923B27-D665-490E-94F5-FA40E1607FB6}
{5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88} = {AC923B27-D665-490E-94F5-FA40E1607FB6}
{DCC13474-28DF-47CA-A8EB-72F8CE9A78C5} = {AC923B27-D665-490E-94F5-FA40E1607FB6}
{40D9233D-E463-4DD6-AB34-47BC3BFBED19} = {AC923B27-D665-490E-94F5-FA40E1607FB6}
EndGlobalSection
EndGlobal
w32/vsnet/GetLibs.vbs
浏览文件 @ d5945f81
'On Error Resume Next 'On Error Resume Next
' **************
' Initialization
' **************
Set WshShell = CreateObject("WScript.Shell") Set WshShell = CreateObject("WScript.Shell")
Set FSO = CreateObject("Scripting.FileSystemObject") Set FSO = CreateObject("Scripting.FileSystemObject")
Set WshSysEnv = WshShell.Environment("SYSTEM") Set WshSysEnv = WshShell.Environment("SYSTEM")
...@@ -27,6 +31,11 @@ UtilsDir=Showpath(ScriptDir & "Tools") ...@@ -27,6 +31,11 @@ UtilsDir=Showpath(ScriptDir & "Tools")
GetTarGZObjects UtilsDir GetTarGZObjects UtilsDir
GetVCBuild GetVCBuild
Wscript.echo "Detected VCBuild: " & VCBuild Wscript.echo "Detected VCBuild: " & VCBuild
' **************
' Option Parsing
' **************
If objArgs.Count >=2 Then If objArgs.Count >=2 Then
Select Case objArgs(1) Select Case objArgs(1)
Case "Release" Case "Release"
...@@ -86,45 +95,62 @@ Else ...@@ -86,45 +95,62 @@ Else
BuildSpiderMonkey=True BuildSpiderMonkey=True
End If End If
' ******************
' Process lib builds
' ******************
If BuildCore Then If BuildCore Then
BuildLibs_Core BuildDebug, BuildRelease If Not FSO.FolderExists(LibDestDir & "include") Then
FSO.CreateFolder(LibDestDir & "include")
End If
BuildLibs_apr BuildDebug, BuildRelease
FSO.CopyFile LibDestDir & "apr\include\*.h", LibDestDir & "include"
BuildLibs_apriconv BuildDebug, BuildRelease
FSO.CopyFile LibDestDir & "apr-iconv\include\*.h", LibDestDir & "include"
BuildLibs_aprutil BuildDebug, BuildRelease
FSO.CopyFile LibDestDir & "apr-util\include\*.h", LibDestDir & "include"
BuildLibs_libresample BuildDebug, BuildRelease
FSO.CopyFile LibDestDir & "libresample\include\*.h", LibDestDir & "include"
BuildLibs_sqlite BuildDebug, BuildRelease
FSO.CopyFile LibDestDir & "sqlite\*.h", LibDestDir & "include"
End If End If
If BuildModExosip Then If BuildModExosip Then
BuildLibs_ModExosip BuildDebug, BuildRelease BuildLibs_libosip2 BuildDebug, BuildRelease
BuildLibs_exosip BuildDebug, BuildRelease
BuildLibs_jrtplib BuildDebug, BuildRelease
End If End If
If BuildModIaxChan Then If BuildModIaxChan Then
BuildLibs_ModIaxChan BuildDebug, BuildRelease BuildLibs_libiax2 BuildDebug, BuildRelease
End If End If
If BuildModPortAudio Then If BuildModPortAudio Then
BuildLibs_ModPortAudio BuildDebug, BuildRelease BuildLibs_portaudio BuildDebug, BuildRelease
End If End If
If BuildModSpeexCodec Then If BuildModSpeexCodec Then
BuildLibs_ModSpeexCodec BuildDebug, BuildRelease BuildLibs_SpeexCodec BuildDebug, BuildRelease
End If End If
If BuildModCodecG729 Then If BuildModCodecG729 Then
BuildLibs_ModCodecG729 BuildDebug, BuildRelease BuildLibs_libg729 BuildDebug, BuildRelease
End If End If
If BuildModCodecGSM Then If BuildModCodecGSM Then
BuildLibs_ModCodecGSM BuildDebug, BuildRelease BuildLibs_libgsm BuildDebug, BuildRelease
End If End If
If BuildModXMPPEvent Then If BuildModXMPPEvent Then
BuildLibs_ModXMPPEvent BuildDebug, BuildRelease BuildLibs_iksemel BuildDebug, BuildRelease
End If End If
If BuildModsndfile Then If BuildModsndfile Then
BuildLibs_Modsndfile BuildDebug, BuildRelease BuildLibs_libsndfile BuildDebug, BuildRelease
End If End If
If BuildModrawaudio Then If BuildModrawaudio Then
BuildLibs_Modrawaudio BuildDebug, BuildRelease BuildLibs_libresample BuildDebug, BuildRelease
End If End If
If BuildSpiderMonkey Then If BuildSpiderMonkey Then
...@@ -133,63 +159,10 @@ End If ...@@ -133,63 +159,10 @@ End If
WScript.Echo "Complete" WScript.Echo "Complete"
Sub BuildLibs_Core(BuildDebug, BuildRelease) ' ******************
If Not FSO.FolderExists(LibDestDir & "include") Then ' Lib Build Sectiton
FSO.CreateFolder(LibDestDir & "include") ' ******************
End If Sub BuildLibs_aprutil(BuildDebug, BuildRelease)
If Not FSO.FolderExists(LibDestDir & "apr") Then
WgetUnTarGz "ftp://ftp.wayne.edu/apache/apr/apr-1.2.2.tar.gz", LibDestDir
If Not FSO.FolderExists(LibDestDir & "apr-1.2.2") Then
Wscript.echo "Unable to get apr from default download location, Trying backup location:"
WgetUnTarGz "http://www.sofaswitch.org/mikej/apr-1.2.2.tar.gz", LibDestDir
End If
RenameFolder LibDestDir & "apr-1.2.2", "apr"
FSO.CopyFile Utilsdir & "apr\apr.vcproj", LibDestDir & "apr\", True
FindReplaceInFile LibDestDir & "apr\file_io\unix\fullrw.c", "int i;", "unsigned int i;"
End If
If FSO.FolderExists(LibDestDir & "apr") Then
If BuildDebug Then
If Not FSO.FileExists(LibDestDir & "apr\LibD\apr-1.lib") Then
BuildViaVCBuild LibDestDir & "apr\apr.vcproj", "Debug"
FSO.CopyFile LibDestDir & "apr\include\*.h", LibDestDir & "include"
End If
End If
If BuildRelease Then
If Not FSO.FileExists(LibDestDir & "apr\LibR\apr-1.lib") Then
BuildViaVCBuild LibDestDir & "apr\apr.vcproj", "Release"
FSO.CopyFile LibDestDir & "apr\include\*.h", LibDestDir & "include"
End If
End If
Else
Wscript.echo "Unable to download APR"
End If
If Not FSO.FolderExists(LibDestDir & "apr-iconv") Then
WgetUnTarGz "ftp://ftp.wayne.edu/apache/apr/apr-iconv-1.1.1.tar.gz", LibDestDir
If Not FSO.FolderExists(LibDestDir & "apr-iconv-1.1.1") Then
Wscript.echo "Unable to get apr-iconv from default download location, Trying backup location:"
WgetUnTarGz "http://www.sofaswitch.org/mikej/apr-iconv-1.1.1.tar.gz", LibDestDir
End If
RenameFolder LibDestDir & "apr-iconv-1.1.1", "apr-iconv"
FSO.CopyFile Utilsdir & "apr\apriconv.vcproj", LibDestDir & "apr-iconv\", True
End If
If FSO.FolderExists(LibDestDir & "apr-iconv") Then
If BuildDebug Then
If Not FSO.FileExists(LibDestDir & "apr-iconv\LibD\apriconv-1.lib") Then
BuildViaVCBuild LibDestDir & "apr-iconv\apriconv.vcproj", "Debug"
FSO.CopyFile LibDestDir & "apr-iconv\include\*.h", LibDestDir & "include"
End If
End If
If BuildRelease Then
If Not FSO.FileExists(LibDestDir & "apr-iconv\LibR\apriconv-1.lib") Then
BuildViaVCBuild LibDestDir & "apr-iconv\apriconv.vcproj", "Release"
FSO.CopyFile LibDestDir & "apr-iconv\include\*.h", LibDestDir & "include"
End If
End If
Else
Wscript.echo "Unable to download apr-iconv"
End If
If Not FSO.FolderExists(LibDestDir & "apr-util") Then If Not FSO.FolderExists(LibDestDir & "apr-util") Then
WgetUnTarGz "ftp://ftp.wayne.edu/apache/apr/apr-util-1.2.2.tar.gz", LibDestDir WgetUnTarGz "ftp://ftp.wayne.edu/apache/apr/apr-util-1.2.2.tar.gz", LibDestDir
If Not FSO.FolderExists(LibDestDir & "apr-util-1.2.2") Then If Not FSO.FolderExists(LibDestDir & "apr-util-1.2.2") Then
...@@ -211,7 +184,6 @@ End If ...@@ -211,7 +184,6 @@ End If
End If End If
If Not FSO.FileExists(LibDestDir & "apr-util\LibD\aprutil-1.lib") Then If Not FSO.FileExists(LibDestDir & "apr-util\LibD\aprutil-1.lib") Then
BuildViaVCBuild LibDestDir & "apr-util\aprutil.vcproj", "Debug" BuildViaVCBuild LibDestDir & "apr-util\aprutil.vcproj", "Debug"
FSO.CopyFile LibDestDir & "apr-util\include\*.h", LibDestDir & "include"
End If End If
End If End If
If BuildRelease Then If BuildRelease Then
...@@ -223,75 +195,93 @@ End If ...@@ -223,75 +195,93 @@ End If
End If End If
If Not FSO.FileExists(LibDestDir & "apr-util\LibR\aprutil-1.lib") Then If Not FSO.FileExists(LibDestDir & "apr-util\LibR\aprutil-1.lib") Then
BuildViaVCBuild LibDestDir & "apr-util\aprutil.vcproj", "Release" BuildViaVCBuild LibDestDir & "apr-util\aprutil.vcproj", "Release"
FSO.CopyFile LibDestDir & "apr-util\include\*.h", LibDestDir & "include"
End If End If
End If End If
Else Else
Wscript.echo "Unable to download apr-util" Wscript.echo "Unable to download apr-util"
End If End If
End Sub
If Not FSO.FolderExists(LibDestDir & "sqlite") Then Sub BuildLibs_apriconv(BuildDebug, BuildRelease)
WgetUnZip "http://www.sqlite.org/sqlite-source-3_2_7.zip", LibDestDir If Not FSO.FolderExists(LibDestDir & "apr-iconv") Then
If Not FSO.FolderExists(LibDestDir & "sqlite-source-3_2_7") Then WgetUnTarGz "ftp://ftp.wayne.edu/apache/apr/apr-iconv-1.1.1.tar.gz", LibDestDir
Wscript.echo "Unable to get SQLite from default download location, Trying backup location:" If Not FSO.FolderExists(LibDestDir & "apr-iconv-1.1.1") Then
WgetUnTarGz "http://www.sofaswitch.org/mikej/sqlite-source-3_2_7.zip", LibDestDir Wscript.echo "Unable to get apr-iconv from default download location, Trying backup location:"
WgetUnTarGz "http://www.sofaswitch.org/mikej/apr-iconv-1.1.1.tar.gz", LibDestDir
End If End If
RenameFolder LibDestDir & "sqlite-source-3_2_7", "sqlite" RenameFolder LibDestDir & "apr-iconv-1.1.1", "apr-iconv"
FSO.CopyFile Utilsdir & "sqlite.vcproj", LibDestDir & "sqlite\", True FSO.CopyFile Utilsdir & "apr\apriconv.vcproj", LibDestDir & "apr-iconv\", True
FindReplaceInFile LibDestDir & "sqlite\sqlite.vcproj", "WIN32;", "_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;"
' Upgrade Utilsdir & "sqlite.vcproj", LibDestDir & "sqlite\sqlite.vcproj"
FSO.CopyFile LibDestDir & "sqlite\*.h", LibDestDir & "include"
End If End If
If FSO.FolderExists(LibDestDir & "sqlite") Then If FSO.FolderExists(LibDestDir & "apr-iconv") Then
If BuildDebug Then If BuildDebug Then
If Not FSO.FileExists(LibDestDir & "sqlite\Debug\sqlite.lib") Then If Not FSO.FileExists(LibDestDir & "apr-iconv\LibD\apriconv-1.lib") Then
' UpgradeViaDevEnv LibDestDir & "sqlite\sqlite.vcproj" BuildViaVCBuild LibDestDir & "apr-iconv\apriconv.vcproj", "Debug"
BuildViaVCBuild LibDestDir & "sqlite\sqlite.vcproj", "Debug"
End If End If
End If End If
If BuildRelease Then If BuildRelease Then
If Not FSO.FileExists(LibDestDir & "sqlite\Release\sqlite.lib") Then If Not FSO.FileExists(LibDestDir & "apr-iconv\LibR\apriconv-1.lib") Then
' UpgradeViaDevEnv LibDestDir & "sqlite\sqlite.vcproj" BuildViaVCBuild LibDestDir & "apr-iconv\apriconv.vcproj", "Release"
BuildViaVCBuild LibDestDir & "sqlite\sqlite.vcproj", "Release"
End If End If
End If End If
Else Else
Wscript.echo "Unable to download SQLite" Wscript.echo "Unable to download apr-iconv"
End If End If
End Sub End Sub
Sub BuildLibs_apr(BuildDebug, BuildRelease)
Sub BuildLibs_ModXMPPEvent(BuildDebug, BuildRelease) If Not FSO.FolderExists(LibDestDir & "apr") Then
If Not FSO.FolderExists(LibDestDir & "iksemel") Then WgetUnTarGz "ftp://ftp.wayne.edu/apache/apr/apr-1.2.2.tar.gz", LibDestDir
WgetUnTarGz "http://jabberstudio.2nw.net/iksemel/iksemel-1.2.tar.gz", LibDestDir If Not FSO.FolderExists(LibDestDir & "apr-1.2.2") Then
If Not FSO.FolderExists(LibDestDir & "iksemel-1.2") Then Wscript.echo "Unable to get apr from default download location, Trying backup location:"
Wscript.echo "Unable to get iksemel from default download location, Trying backup location:" WgetUnTarGz "http://www.sofaswitch.org/mikej/apr-1.2.2.tar.gz", LibDestDir
WgetUnTarGz "http://www.sofaswitch.org/mikej/iksemel-1.2.tar.gz", LibDestDir
End If End If
RenameFolder LibDestDir & "iksemel-1.2", "iksemel" RenameFolder LibDestDir & "apr-1.2.2", "apr"
FSO.CopyFile Utilsdir & "iksemel\iksemel.vcproj", LibDestDir & "iksemel\", True FSO.CopyFile Utilsdir & "apr\apr.vcproj", LibDestDir & "apr\", True
FSO.CopyFile Utilsdir & "iksemel\config.h", LibDestDir & "iksemel\include\", True FindReplaceInFile LibDestDir & "apr\file_io\unix\fullrw.c", "int i;", "unsigned int i;"
End If End If
If FSO.FolderExists(LibDestDir & "iksemel") Then If FSO.FolderExists(LibDestDir & "apr") Then
If BuildDebug Then If BuildDebug Then
If Not FSO.FileExists(LibDestDir & "iksemel\Debug\iksemel.lib") Then If Not FSO.FileExists(LibDestDir & "apr\LibD\apr-1.lib") Then
BuildViaVCBuild LibDestDir & "iksemel\iksemel.vcproj", "Debug" BuildViaVCBuild LibDestDir & "apr\apr.vcproj", "Debug"
End If End If
End If End If
If BuildRelease Then If BuildRelease Then
If Not FSO.FileExists(LibDestDir & "iksemel\Release\iksemel.lib") Then If Not FSO.FileExists(LibDestDir & "apr\LibR\apr-1.lib") Then
BuildViaVCBuild LibDestDir & "iksemel\iksemel.vcproj", "Release" BuildViaVCBuild LibDestDir & "apr\apr.vcproj", "Release"
End If End If
End If End If
Else Else
Wscript.echo "Unable to download iksemel" Wscript.echo "Unable to download APR"
End If End If
End Sub End Sub
Sub BuildLibs_exosip(BuildDebug, BuildRelease)
If Not FSO.FolderExists(LibDestDir & "libeXosip2") Then
WgetUnTarGz "http://www.antisip.com/download/libeXosip2-2.2.2.tar.gz", LibDestDir
If Not FSO.FolderExists(LibDestDir & "libeXosip2-2.2.2") Then
Wscript.echo "Unable to get eXosip from default download location, Trying backup location:"
WgetUnTarGz "http://www.sofaswitch.org/mikej/libeXosip2-2.2.2.tar.gz", LibDestDir
End If
RenameFolder LibDestDir & "libeXosip2-2.2.2", "libeXosip2"
FindReplaceInFile LibDestDir & "libeXosip2\platform\vsnet\eXosip.vcproj", "WIN32;", "_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;"
End If
If FSO.FolderExists(LibDestDir & "libeXosip2") Then
If BuildDebug Then
If Not FSO.FileExists(LibDestDir & "libeXosip2\platform\vsnet\Debug\exosip.lib") Then
BuildViaVCBuild LibDestDir & "libeXosip2\platform\vsnet\exosip.vcproj", "Debug"
End If
End If
If BuildRelease Then
If Not FSO.FileExists(LibDestDir & "libeXosip2\platform\vsnet\Release\exosip.lib") Then
BuildViaVCBuild LibDestDir & "libeXosip2\platform\vsnet\exosip.vcproj", "Release"
End If
End If
Else
Wscript.echo "Unable to download exosip"
End If
End Sub
Sub BuildLibs_ModExosip(BuildDebug, BuildRelease) Sub BuildLibs_libosip2(BuildDebug, BuildRelease)
If Not FSO.FolderExists(LibDestDir & "osip") Then If Not FSO.FolderExists(LibDestDir & "osip") Then
WgetUnTarGz "http://www.antisip.com/download/libosip2-2.2.2.tar.gz", LibDestDir WgetUnTarGz "http://www.antisip.com/download/libosip2-2.2.2.tar.gz", LibDestDir
If Not FSO.FolderExists(LibDestDir & "libosip2-2.2.2") Then If Not FSO.FolderExists(LibDestDir & "libosip2-2.2.2") Then
...@@ -299,22 +289,18 @@ Sub BuildLibs_ModExosip(BuildDebug, BuildRelease) ...@@ -299,22 +289,18 @@ Sub BuildLibs_ModExosip(BuildDebug, BuildRelease)
WgetUnTarGz "http://www.sofaswitch.org/mikej/libosip2-2.2.2.tar.gz", LibDestDir WgetUnTarGz "http://www.sofaswitch.org/mikej/libosip2-2.2.2.tar.gz", LibDestDir
End If End If
RenameFolder LibDestDir & "libosip2-2.2.2", "osip" RenameFolder LibDestDir & "libosip2-2.2.2", "osip"
' FSO.CopyFile Utilsdir & "osipparser2.vcproj", LibDestDir & "osip\platform\vsnet\", True
' FSO.CopyFile Utilsdir & "osip2.vcproj", LibDestDir & "osip\platform\vsnet\", True
FindReplaceInFile LibDestDir & "osip\platform\vsnet\osipparser2.vcproj", "WIN32;", "_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;" FindReplaceInFile LibDestDir & "osip\platform\vsnet\osipparser2.vcproj", "WIN32;", "_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;"
FindReplaceInFile LibDestDir & "osip\platform\vsnet\osip2.vcproj", "WIN32;", "_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;" FindReplaceInFile LibDestDir & "osip\platform\vsnet\osip2.vcproj", "WIN32;", "_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;"
End If End If
If FSO.FolderExists(LibDestDir & "osip") Then If FSO.FolderExists(LibDestDir & "osip") Then
If BuildDebug Then If BuildDebug Then
If Not FSO.FileExists(LibDestDir & "osip\platform\vsnet\Debug\osip2.lib") Then If Not FSO.FileExists(LibDestDir & "osip\platform\vsnet\Debug\osip2.lib") Then
' UpgradeViaDevEnv LibDestDir & "osip\platform\vsnet\osip.sln"
BuildViaVCBuild LibDestDir & "osip\platform\vsnet\osip2.vcproj", "Debug" BuildViaVCBuild LibDestDir & "osip\platform\vsnet\osip2.vcproj", "Debug"
BuildViaVCBuild LibDestDir & "osip\platform\vsnet\osipparser2.vcproj", "Debug" BuildViaVCBuild LibDestDir & "osip\platform\vsnet\osipparser2.vcproj", "Debug"
End If End If
End If End If
If BuildRelease Then If BuildRelease Then
If Not FSO.FileExists(LibDestDir & "osip\platform\vsnet\Release\osip2.lib") Then If Not FSO.FileExists(LibDestDir & "osip\platform\vsnet\Release\osip2.lib") Then
' UpgradeViaDevEnv LibDestDir & "osip\platform\vsnet\osip.sln"
BuildViaVCBuild LibDestDir & "osip\platform\vsnet\osip2.vcproj", "Release" BuildViaVCBuild LibDestDir & "osip\platform\vsnet\osip2.vcproj", "Release"
BuildViaVCBuild LibDestDir & "osip\platform\vsnet\osipparser2.vcproj", "Release" BuildViaVCBuild LibDestDir & "osip\platform\vsnet\osipparser2.vcproj", "Release"
End If End If
...@@ -322,34 +308,9 @@ Sub BuildLibs_ModExosip(BuildDebug, BuildRelease) ...@@ -322,34 +308,9 @@ Sub BuildLibs_ModExosip(BuildDebug, BuildRelease)
Else Else
Wscript.echo "Unable to download Osip" Wscript.echo "Unable to download Osip"
End If End If
End Sub
If Not FSO.FolderExists(LibDestDir & "libeXosip2") Then Sub BuildLibs_jrtplib(BuildDebug, BuildRelease)
WgetUnTarGz "http://www.antisip.com/download/libeXosip2-2.2.2.tar.gz", LibDestDir
If Not FSO.FolderExists(LibDestDir & "libeXosip2-2.2.2") Then
Wscript.echo "Unable to get eXosip from default download location, Trying backup location:"
WgetUnTarGz "http://www.sofaswitch.org/mikej/libeXosip2-2.2.2.tar.gz", LibDestDir
End If
RenameFolder LibDestDir & "libeXosip2-2.2.2", "libeXosip2"
FindReplaceInFile LibDestDir & "libeXosip2\platform\vsnet\eXosip.vcproj", "WIN32;", "_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;"
' FSO.CopyFile Utilsdir & "eXosip.vcproj", LibDestDir & "libeXosip2\platform\vsnet\", True
End If
If FSO.FolderExists(LibDestDir & "libeXosip2") Then
If BuildDebug Then
If Not FSO.FileExists(LibDestDir & "libeXosip2\platform\vsnet\Debug\exosip.lib") Then
' UpgradeViaDevEnv LibDestDir & "libeXosip2\platform\vsnet\exosip.vcproj"
BuildViaVCBuild LibDestDir & "libeXosip2\platform\vsnet\exosip.vcproj", "Debug"
End If
End If
If BuildRelease Then
If Not FSO.FileExists(LibDestDir & "libeXosip2\platform\vsnet\Release\exosip.lib") Then
' UpgradeViaDevEnv LibDestDir & "libeXosip2\platform\vsnet\exosip.vcproj"
BuildViaVCBuild LibDestDir & "libeXosip2\platform\vsnet\exosip.vcproj", "Release"
End If
End If
Else
Wscript.echo "Unable to download exosip"
End If
If Not FSO.FolderExists(LibDestDir & "jthread-1.1.2") Then If Not FSO.FolderExists(LibDestDir & "jthread-1.1.2") Then
WgetUnTarGz "http://research.edm.luc.ac.be/jori/jthread/jthread-1.1.2.tar.gz", LibDestDir WgetUnTarGz "http://research.edm.luc.ac.be/jori/jthread/jthread-1.1.2.tar.gz", LibDestDir
If Not FSO.FolderExists(LibDestDir & "jthread-1.1.2") Then If Not FSO.FolderExists(LibDestDir & "jthread-1.1.2") Then
...@@ -369,31 +330,80 @@ Sub BuildLibs_ModExosip(BuildDebug, BuildRelease) ...@@ -369,31 +330,80 @@ Sub BuildLibs_ModExosip(BuildDebug, BuildRelease)
FindReplaceInFile LibDestDir & "jrtplib\jrtplib.vcproj", "WIN32;", "_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;" FindReplaceInFile LibDestDir & "jrtplib\jrtplib.vcproj", "WIN32;", "_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;"
FindReplaceInFile LibDestDir & "jrtplib\jrtplib.vcproj", "WarningLevel=" & quote & "3" & quote, "WarningLevel=" & quote & "0" & quote FindReplaceInFile LibDestDir & "jrtplib\jrtplib.vcproj", "WarningLevel=" & quote & "3" & quote, "WarningLevel=" & quote & "0" & quote
End If End If
If FSO.FolderExists(LibDestDir & "jrtplib") And FSO.FolderExists(LibDestDir & "jthread-1.1.2") And FSO.FolderExists(LibDestDir & "jrtp4c")Then
If FSO.FolderExists(LibDestDir & "jrtplib") And FSO.FolderExists(LibDestDir & "jthread-1.1.2") Then
If BuildDebug Then If BuildDebug Then
If (Not FSO.FileExists(LibDestDir & "jrtp4c\w32\Debug\jrtp4c.lib")) Or (Not FSO.FileExists(LibDestDir & "jrtplib\Debug\jrtplib.lib")) Or (Not FSO.FileExists(LibDestDir & "jthread-1.1.2\Debug\jthread.lib")) Then If (Not FSO.FileExists(LibDestDir & "jrtplib\Debug\jrtplib.lib")) Or (Not FSO.FileExists(LibDestDir & "jthread-1.1.2\Debug\jthread.lib")) Then
' UpgradeViaDevEnv LibDestDir & "jrtp4c\w32\jrtp4c.sln"
BuildViaVCBuild LibDestDir & "jrtp4c\w32\jrtp4c.vcproj", "Debug"
BuildViaVCBuild LibDestDir & "jrtplib\jrtplib.vcproj", "Debug"
BuildViaVCBuild LibDestDir & "jthread-1.1.2\jthread.vcproj", "Debug" BuildViaVCBuild LibDestDir & "jthread-1.1.2\jthread.vcproj", "Debug"
BuildViaVCBuild LibDestDir & "jrtplib\jrtplib.vcproj", "Debug"
End If End If
End If End If
If BuildRelease Then If BuildRelease Then
If (Not FSO.FileExists(LibDestDir & "jrtp4c\w32\Release\jrtp4c.lib")) Or (Not FSO.FileExists(LibDestDir & "jrtplib\Release\jrtplib.lib")) Or (Not FSO.FileExists(LibDestDir & "jthread-1.1.2\Release\jthread.lib")) Then If (Not FSO.FileExists(LibDestDir & "jrtplib\Release\jrtplib.lib")) Or (Not FSO.FileExists(LibDestDir & "jthread-1.1.2\Release\jthread.lib")) Then
' UpgradeViaDevEnv LibDestDir & "jrtp4c\w32\jrtp4c.sln"
BuildViaVCBuild LibDestDir & "jrtp4c\w32\jrtp4c.vcproj", "Release"
BuildViaVCBuild LibDestDir & "jrtplib\jrtplib.vcproj", "Release"
BuildViaVCBuild LibDestDir & "jthread-1.1.2\jthread.vcproj", "Release" BuildViaVCBuild LibDestDir & "jthread-1.1.2\jthread.vcproj", "Release"
BuildViaVCBuild LibDestDir & "jrtplib\jrtplib.vcproj", "Release"
End If End If
End If End If
Else Else
Wscript.echo "Unable to download JRtplib" Wscript.echo "Unable to download JRtplib"
End If End If
End Sub
Sub BuildLibs_sqlite(BuildDebug, BuildRelease)
If Not FSO.FolderExists(LibDestDir & "sqlite") Then
WgetUnZip "http://www.sqlite.org/sqlite-source-3_2_7.zip", LibDestDir
If Not FSO.FolderExists(LibDestDir & "sqlite-source-3_2_7") Then
Wscript.echo "Unable to get SQLite from default download location, Trying backup location:"
WgetUnTarGz "http://www.sofaswitch.org/mikej/sqlite-source-3_2_7.zip", LibDestDir
End If
RenameFolder LibDestDir & "sqlite-source-3_2_7", "sqlite"
FSO.CopyFile Utilsdir & "sqlite.vcproj", LibDestDir & "sqlite\", True
FindReplaceInFile LibDestDir & "sqlite\sqlite.vcproj", "WIN32;", "_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;"
End If
If FSO.FolderExists(LibDestDir & "sqlite") Then
If BuildDebug Then
If Not FSO.FileExists(LibDestDir & "sqlite\Debug\sqlite.lib") Then
BuildViaVCBuild LibDestDir & "sqlite\sqlite.vcproj", "Debug"
End If
End If
If BuildRelease Then
If Not FSO.FileExists(LibDestDir & "sqlite\Release\sqlite.lib") Then
BuildViaVCBuild LibDestDir & "sqlite\sqlite.vcproj", "Release"
End If
End If
Else
Wscript.echo "Unable to download SQLite"
End If
End Sub
Sub BuildLibs_iksemel(BuildDebug, BuildRelease)
If Not FSO.FolderExists(LibDestDir & "iksemel") Then
WgetUnTarGz "http://jabberstudio.2nw.net/iksemel/iksemel-1.2.tar.gz", LibDestDir
If Not FSO.FolderExists(LibDestDir & "iksemel-1.2") Then
Wscript.echo "Unable to get iksemel from default download location, Trying backup location:"
WgetUnTarGz "http://www.sofaswitch.org/mikej/iksemel-1.2.tar.gz", LibDestDir
End If
RenameFolder LibDestDir & "iksemel-1.2", "iksemel"
FSO.CopyFile Utilsdir & "iksemel\iksemel.vcproj", LibDestDir & "iksemel\", True
FSO.CopyFile Utilsdir & "iksemel\config.h", LibDestDir & "iksemel\include\", True
End If
If FSO.FolderExists(LibDestDir & "iksemel") Then
If BuildDebug Then
If Not FSO.FileExists(LibDestDir & "iksemel\Debug\iksemel.lib") Then
BuildViaVCBuild LibDestDir & "iksemel\iksemel.vcproj", "Debug"
End If
End If
If BuildRelease Then
If Not FSO.FileExists(LibDestDir & "iksemel\Release\iksemel.lib") Then
BuildViaVCBuild LibDestDir & "iksemel\iksemel.vcproj", "Release"
End If
End If
Else
Wscript.echo "Unable to download iksemel"
End If
End Sub End Sub
Sub BuildLibs_ModIaxChan(BuildDebug, BuildRelease) Sub BuildLibs_libiax2(BuildDebug, BuildRelease)
If FSO.FolderExists(LibDestDir & "iax") Then If FSO.FolderExists(LibDestDir & "iax") Then
If BuildDebug Then If BuildDebug Then
If Not FSO.FileExists(LibDestDir & "iax\Debug\libiax2.lib") Then If Not FSO.FileExists(LibDestDir & "iax\Debug\libiax2.lib") Then
...@@ -408,10 +418,9 @@ Sub BuildLibs_ModIaxChan(BuildDebug, BuildRelease) ...@@ -408,10 +418,9 @@ Sub BuildLibs_ModIaxChan(BuildDebug, BuildRelease)
Else Else
Wscript.echo "Unable to download libIAX2" Wscript.echo "Unable to download libIAX2"
End If End If
End Sub End Sub
Sub BuildLibs_ModPortAudio(BuildDebug, BuildRelease) Sub BuildLibs_portaudio(BuildDebug, BuildRelease)
If Not FSO.FolderExists(LibDestDir & "PortAudio") Then If Not FSO.FolderExists(LibDestDir & "PortAudio") Then
WgetUnZip "http://www.sofaswitch.org/mikej/portaudio_v18_1.zip", LibDestDir WgetUnZip "http://www.sofaswitch.org/mikej/portaudio_v18_1.zip", LibDestDir
RenameFolder LibDestDir & "portaudio_v18_1", "PortAudio" RenameFolder LibDestDir & "portaudio_v18_1", "PortAudio"
...@@ -430,37 +439,9 @@ Sub BuildLibs_ModPortAudio(BuildDebug, BuildRelease) ...@@ -430,37 +439,9 @@ Sub BuildLibs_ModPortAudio(BuildDebug, BuildRelease)
Else Else
Wscript.echo "Unable to download PortAudio" Wscript.echo "Unable to download PortAudio"
End If End If
End Sub End Sub
Sub BuildLibs_ModSpeexCodec(BuildDebug, BuildRelease) Sub BuildLibs_libg729(BuildDebug, BuildRelease)
If Not FSO.FolderExists(LibDestDir & "speex") Then
WgetUnTarGz "http://downloads.us.xiph.org/releases/speex/speex-1.1.11.1.tar.gz", LibDestDir
If Not FSO.FolderExists(LibDestDir & "speex-1.1.11.1") Then
Wscript.echo "Unable to get libspeex from default download location, Trying backup location:"
WgetUnTarGz "http://www.sofaswitch.org/mikej/speex-1.1.11.1.tar.gz", LibDestDir
End If
RenameFolder LibDestDir & "speex-1.1.11.1", "speex"
FSO.CopyFile Utilsdir & "libspeex.vcproj", LibDestDir & "speex\win32\libspeex\", True
End If
If FSO.FolderExists(LibDestDir & "speex") Then
If BuildDebug Then
If Not FSO.FileExists(LibDestDir & "speex\win32\libspeex\Debug\libspeex.lib") Then
BuildViaVCBuild LibDestDir & "speex\win32\libspeex\libspeex.vcproj", "Debug"
End If
End If
If BuildRelease Then
If Not FSO.FileExists(LibDestDir & "speex\win32\libspeex\Release\libspeex.lib") Then
BuildViaVCBuild LibDestDir & "speex\win32\libspeex\libspeex.vcproj", "Release"
End If
End If
Else
Wscript.echo "Unable to download libspeex"
End If
End Sub
Sub BuildLibs_ModCodecG729(BuildDebug, BuildRelease)
If FSO.FolderExists(LibDestDir & "codec\libg729") Then If FSO.FolderExists(LibDestDir & "codec\libg729") Then
If BuildDebug Then If BuildDebug Then
If Not FSO.FileExists(LibDestDir & "codec\libg729\Debug\libg729.lib") Then If Not FSO.FileExists(LibDestDir & "codec\libg729\Debug\libg729.lib") Then
...@@ -477,7 +458,7 @@ Sub BuildLibs_ModCodecG729(BuildDebug, BuildRelease) ...@@ -477,7 +458,7 @@ Sub BuildLibs_ModCodecG729(BuildDebug, BuildRelease)
End If End If
End Sub End Sub
Sub BuildLibs_ModCodecGSM(BuildDebug, BuildRelease) Sub BuildLibs_libgsm(BuildDebug, BuildRelease)
If FSO.FolderExists(LibDestDir & "codec\gsm") Then If FSO.FolderExists(LibDestDir & "codec\gsm") Then
If BuildDebug Then If BuildDebug Then
If Not FSO.FileExists(LibDestDir & "codec\gsm\Debug\libgsm.lib") Then If Not FSO.FileExists(LibDestDir & "codec\gsm\Debug\libgsm.lib") Then
...@@ -494,7 +475,7 @@ Sub BuildLibs_ModCodecGSM(BuildDebug, BuildRelease) ...@@ -494,7 +475,7 @@ Sub BuildLibs_ModCodecGSM(BuildDebug, BuildRelease)
End If End If
End Sub End Sub
Sub BuildLibs_ModSpeexCodec(BuildDebug, BuildRelease) Sub BuildLibs_SpeexCodec(BuildDebug, BuildRelease)
If Not FSO.FolderExists(LibDestDir & "speex") Then If Not FSO.FolderExists(LibDestDir & "speex") Then
WgetUnTarGz "http://downloads.us.xiph.org/releases/speex/speex-1.1.11.1.tar.gz", LibDestDir WgetUnTarGz "http://downloads.us.xiph.org/releases/speex/speex-1.1.11.1.tar.gz", LibDestDir
If Not FSO.FolderExists(LibDestDir & "speex-1.1.11.1") Then If Not FSO.FolderExists(LibDestDir & "speex-1.1.11.1") Then
...@@ -518,10 +499,9 @@ Sub BuildLibs_ModSpeexCodec(BuildDebug, BuildRelease) ...@@ -518,10 +499,9 @@ Sub BuildLibs_ModSpeexCodec(BuildDebug, BuildRelease)
Else Else
Wscript.echo "Unable to download libspeex" Wscript.echo "Unable to download libspeex"
End If End If
End Sub End Sub
Sub BuildLibs_Modsndfile(BuildDebug, BuildRelease) Sub BuildLibs_libsndfile(BuildDebug, BuildRelease)
If Not FSO.FolderExists(LibDestDir & "libsndfile") Then If Not FSO.FolderExists(LibDestDir & "libsndfile") Then
WgetUnTarGz "http://www.sofaswitch.com/mikej/libsndfile-1.0.12.tar.gz", LibDestDir WgetUnTarGz "http://www.sofaswitch.com/mikej/libsndfile-1.0.12.tar.gz", LibDestDir
RenameFolder LibDestDir & "libsndfile-1.0.12", "libsndfile" RenameFolder LibDestDir & "libsndfile-1.0.12", "libsndfile"
...@@ -541,10 +521,9 @@ Sub BuildLibs_Modsndfile(BuildDebug, BuildRelease) ...@@ -541,10 +521,9 @@ Sub BuildLibs_Modsndfile(BuildDebug, BuildRelease)
Else Else
Wscript.echo "Unable to download libsndfile" Wscript.echo "Unable to download libsndfile"
End If End If
End Sub End Sub
Sub BuildLibs_Modrawaudio(BuildDebug, BuildRelease) Sub BuildLibs_libresample(BuildDebug, BuildRelease)
If Not FSO.FolderExists(LibDestDir & "libresample") Then If Not FSO.FolderExists(LibDestDir & "libresample") Then
WgetUnZip "http://www.sofaswitch.com/mikej/libresample-0.1.3.zip", LibDestDir WgetUnZip "http://www.sofaswitch.com/mikej/libresample-0.1.3.zip", LibDestDir
RenameFolder LibDestDir & "libresample-0.1.3", "libresample" RenameFolder LibDestDir & "libresample-0.1.3", "libresample"
...@@ -563,7 +542,6 @@ Sub BuildLibs_Modrawaudio(BuildDebug, BuildRelease) ...@@ -563,7 +542,6 @@ Sub BuildLibs_Modrawaudio(BuildDebug, BuildRelease)
Else Else
Wscript.echo "Unable to download libresample" Wscript.echo "Unable to download libresample"
End If End If
End Sub End Sub
Sub BuildLibs_SpiderMonkey(BuildDebug, BuildRelease) Sub BuildLibs_SpiderMonkey(BuildDebug, BuildRelease)
...@@ -593,9 +571,11 @@ Sub BuildLibs_SpiderMonkey(BuildDebug, BuildRelease) ...@@ -593,9 +571,11 @@ Sub BuildLibs_SpiderMonkey(BuildDebug, BuildRelease)
Else Else
Wscript.echo "Unable to download spidermonkey" Wscript.echo "Unable to download spidermonkey"
End If End If
End Sub End Sub
' *******************
' Utility Subroutines
' *******************
Sub UpgradeViaDevEnv(ProjectFile) Sub UpgradeViaDevEnv(ProjectFile)
Set oExec = WshShell.Exec(quote & DevEnv & quote & " " & quote & ProjectFile & quote & " /Upgrade ") Set oExec = WshShell.Exec(quote & DevEnv & quote & " " & quote & ProjectFile & quote & " /Upgrade ")
...@@ -662,14 +642,11 @@ End Sub ...@@ -662,14 +642,11 @@ End Sub
Sub RenameFolder(FolderName, NewFolderName) Sub RenameFolder(FolderName, NewFolderName)
'On Error Resume Next
Set Folder=FSO.GetFolder(FolderName) Set Folder=FSO.GetFolder(FolderName)
Folder.Name = NewFolderName Folder.Name = NewFolderName
'On Error GoTo 0
End Sub End Sub
Sub Upgrade(OldFileName, NewFileName) Sub Upgrade(OldFileName, NewFileName)
'On Error Resume Next
If WshSysEnv("VS80COMNTOOLS")<> "" Then If WshSysEnv("VS80COMNTOOLS")<> "" Then
Wscript.echo "8.0" Wscript.echo "8.0"
Set vcProj = CreateObject("VisualStudio.VCProjectEngine.8.0") Set vcProj = CreateObject("VisualStudio.VCProjectEngine.8.0")
...@@ -683,9 +660,6 @@ Sub Upgrade(OldFileName, NewFileName) ...@@ -683,9 +660,6 @@ Sub Upgrade(OldFileName, NewFileName)
End If End If
End If End If
' WScript.Echo("Converting: "+ OldFileName)
Set vcProject = vcProj.LoadProject(OldFileName) Set vcProject = vcProj.LoadProject(OldFileName)
If Not FSO.FileExists(vcProject.ProjectFile) Then If Not FSO.FileExists(vcProject.ProjectFile) Then
' // specify name and location of new project file ' // specify name and location of new project file
...@@ -698,7 +672,6 @@ Sub Upgrade(OldFileName, NewFileName) ...@@ -698,7 +672,6 @@ Sub Upgrade(OldFileName, NewFileName)
'On Error GoTo 0 'On Error GoTo 0
End Sub End Sub
Sub Unix2dos(FileName) Sub Unix2dos(FileName)
Const OpenAsASCII = 0 ' Opens the file as ASCII (TristateFalse) Const OpenAsASCII = 0 ' Opens the file as ASCII (TristateFalse)
Const OpenAsUnicode = -1 ' Opens the file as Unicode (TristateTrue) Const OpenAsUnicode = -1 ' Opens the file as Unicode (TristateTrue)
...@@ -832,7 +805,6 @@ Sub Wget(URL, DestFolder) ...@@ -832,7 +805,6 @@ Sub Wget(URL, DestFolder)
End Sub End Sub
Function Showpath(folderspec) Function Showpath(folderspec)
Set f = FSO.GetFolder(folderspec) Set f = FSO.GetFolder(folderspec)
showpath = f.path & "\" showpath = f.path & "\"
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论