[asterisk-scf-commits] asterisk-scf/integration/pjproject.git branch "extend-pjsua-python" created.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Tue Aug 21 14:42:59 CDT 2012
branch "extend-pjsua-python" has been created
at 45a3b9fa96c72d42a83fba2fdc5043c40198c17b (commit)
- Log -----------------------------------------------------------------
commit 45a3b9fa96c72d42a83fba2fdc5043c40198c17b
Author: Joshua Colp <jcolp at digium.com>
Date: Mon Dec 12 17:31:39 2011 -0400
Remove the assumption that the URI scheme will always be sip. It can now be specified instead but defaults to sip to preserve previous behavior.
diff --git a/pjsip-apps/src/python/pjsua.py b/pjsip-apps/src/python/pjsua.py
index 9d68f69..9a731d2 100644
--- a/pjsip-apps/src/python/pjsua.py
+++ b/pjsip-apps/src/python/pjsua.py
@@ -742,6 +742,7 @@ class AccountConfig:
transport is required, 1=hop-by-hop secure
transport such as TLS is required, 2=end-to-
end secure transport is required (i.e. "sips").
+ scheme -- URI scheme to use when constructing URIs. Defaults to sip.
"""
priority = 0
id = ""
@@ -761,9 +762,10 @@ class AccountConfig:
ka_data = "\r\n"
use_srtp = 0
srtp_secure_signaling = 1
+ scheme = "sip"
def __init__(self, domain="", username="", password="",
- display="", registrar="", proxy=""):
+ display="", registrar="", proxy="", scheme="sip"):
"""
Construct account config. If domain argument is specified,
a typical configuration will be built.
@@ -779,16 +781,17 @@ class AccountConfig:
proxy -- the proxy URI. If domain name is specified
and this argument is empty, the proxy URI
will be constructed from the domain name.
+ scheme -- URI scheme to use when constructing URIs. Defaults to sip.
"""
default = _pjsua.acc_config_default()
self._cvt_from_pjsua(default)
if domain!="":
self.build_config(domain, username, password,
- display, registrar, proxy)
+ display, registrar, proxy, scheme)
def build_config(self, domain, username, password, display="",
- registrar="", proxy=""):
+ registrar="", proxy="", scheme="sip"):
"""
Construct account config. If domain argument is specified,
a typical configuration will be built.
@@ -804,6 +807,7 @@ class AccountConfig:
proxy -- the proxy URI. If domain name is specified
and this argument is empty, the proxy URI
will be constructed from the domain name.
+ scheme -- URI scheme to use when constructing URIs. Defaults to sip.
"""
if display != "":
@@ -811,12 +815,12 @@ class AccountConfig:
userpart = username
if userpart != "":
userpart = userpart + "@"
- self.id = display + "<sip:" + userpart + domain + ">"
+ self.id = display + "<" + scheme + ":" + userpart + domain + ">"
self.reg_uri = registrar
if self.reg_uri == "":
- self.reg_uri = "sip:" + domain
+ self.reg_uri = scheme + ":" + domain
if proxy == "":
- proxy = "sip:" + domain + ";lr"
+ proxy = scheme + ":" + domain + ";lr"
if proxy.find(";lr") == -1:
proxy = proxy + ";lr"
self.proxy.append(proxy)
commit d359a6146154116c841bb5d2ba8935d94abfbefd
Author: Joshua Colp <jcolp at digium.com>
Date: Mon Dec 12 17:18:27 2011 -0400
Add support for retrieving information about the TLS transport.
diff --git a/pjsip/src/pjsua-lib/pjsua_core.c b/pjsip/src/pjsua-lib/pjsua_core.c
index 7ddfd59..07fcbe3 100644
--- a/pjsip/src/pjsua-lib/pjsua_core.c
+++ b/pjsip/src/pjsua-lib/pjsua_core.c
@@ -2079,6 +2079,27 @@ PJ_DEF(pj_status_t) pjsua_transport_get_info( pjsua_transport_id id,
status = PJ_SUCCESS;
+ } else if (pjsua_var.tpdata[id].type == PJSIP_TRANSPORT_TLS) {
+
+ pjsip_tpfactory *factory = t->data.factory;
+
+ if (factory == NULL) {
+ PJSUA_UNLOCK();
+ return PJ_EINVALIDOP;
+ }
+
+ info->id = id;
+ info->type = t->type;
+ info->type_name = pj_str("TLS");
+ info->info = pj_str("TLS transport");
+ info->flag = factory->flag;
+ info->addr_len = sizeof(factory->local_addr);
+ info->local_addr = factory->local_addr;
+ info->local_name = factory->addr_name;
+ info->usage_count = 0;
+
+ status = PJ_SUCCESS;
+
} else {
pj_assert(!"Unsupported transport");
status = PJ_EINVALIDOP;
commit e249cf8575b8914990bf20d62df375f774f83df2
Author: Joshua Colp <jcolp at digium.com>
Date: Mon Dec 12 11:08:27 2011 -0400
Add TLS configuration items to python module.
diff --git a/pjsip-apps/src/python/pjsua.py b/pjsip-apps/src/python/pjsua.py
index 183ce0e..9d68f69 100644
--- a/pjsip-apps/src/python/pjsua.py
+++ b/pjsip-apps/src/python/pjsua.py
@@ -474,22 +474,60 @@ class TransportConfig:
transport. If empty, the default behavior is to get
the public address from STUN or from the selected
local interface. Format is "host:port".
+ tls_ca_list_file -- Certificate of Authority (CA) list file.
+ tls_cert_file -- Public endpoint certificate file, which will be
+ used as client- side certificate for outgoing TLS
+ connection, and server-side certificate for incoming
+ TLS connection.
+ tls_privkey_file -- Optional private key of the endpoint certificate to be used.
+ tls_password -- Password to open private key.
+ tls_verify_server -- Enables shutdown of the TLS transport if the server certificate
+ can not be verified.
+ tls_verify_client -- Enables shutdown of the TLS transport if the client certificate
+ can not be verified
+ tls_timeout -- TLS negotiation timeout to be applied for both outgoing and
+ incoming connection.
"""
port = 0
bound_addr = ""
public_addr = ""
+ tls_ca_list_file = ""
+ tls_cert_file = ""
+ tls_privkey_file = ""
+ tls_password = ""
+ tls_verify_server = 0
+ tls_verify_client = 0
+ tls_timeout = 0
def __init__(self, port=0,
- bound_addr="", public_addr=""):
+ bound_addr="", public_addr="",
+ tls_ca_list_file = "", tls_cert_file = "",
+ tls_privkey_file = "", tls_password = "",
+ tls_verify_server = 0, tls_verify_client = 0,
+ tls_timeout = 0):
self.port = port
self.bound_addr = bound_addr
self.public_addr = public_addr
+ self.tls_ca_list_file = tls_ca_list_file
+ self.tls_cert_file = tls_cert_file
+ self.tls_privkey_file = tls_privkey_file
+ self.tls_password = tls_password
+ self.tls_verify_server = tls_verify_server
+ self.tls_verify_client = tls_verify_client
+ self.tls_timeout = tls_timeout
def _cvt_to_pjsua(self):
cfg = _pjsua.transport_config_default()
cfg.port = self.port
cfg.bound_addr = self.bound_addr
cfg.public_addr = self.public_addr
+ cfg.tls_ca_list_file = self.tls_ca_list_file
+ cfg.tls_cert_file = self.tls_cert_file
+ cfg.tls_privkey_file = self.tls_privkey_file
+ cfg.tls_password = self.tls_password
+ cfg.tls_verify_server = self.tls_verify_server
+ cfg.tls_verify_client = self.tls_verify_client
+ cfg.tls_timeout = self.tls_timeout
return cfg
commit e6fd8524deaf19a9e72e6ff33db74eeb0b21bdcd
Author: Joshua Colp <jcolp at digium.com>
Date: Mon Dec 12 11:01:34 2011 -0400
Add TLS configuration options to the transport configuration.
diff --git a/pjsip-apps/src/python/_pjsua.h b/pjsip-apps/src/python/_pjsua.h
index 15aeef3..7c99075 100644
--- a/pjsip-apps/src/python/_pjsua.h
+++ b/pjsip-apps/src/python/_pjsua.h
@@ -1327,6 +1327,13 @@ typedef struct
unsigned port;
PyObject *public_addr;
PyObject *bound_addr;
+ PyObject *tls_ca_list_file;
+ PyObject *tls_cert_file;
+ PyObject *tls_privkey_file;
+ PyObject *tls_password;
+ unsigned tls_verify_server;
+ unsigned tls_verify_client;
+ unsigned tls_timeout;
} PyObj_pjsua_transport_config;
@@ -1337,7 +1344,11 @@ typedef struct
static void PyObj_pjsua_transport_config_delete(PyObj_pjsua_transport_config* self)
{
Py_XDECREF(self->public_addr);
- Py_XDECREF(self->bound_addr);
+ Py_XDECREF(self->bound_addr);
+ Py_XDECREF(self->tls_ca_list_file);
+ Py_XDECREF(self->tls_cert_file);
+ Py_XDECREF(self->tls_privkey_file);
+ Py_XDECREF(self->tls_password);
self->ob_type->tp_free((PyObject*)self);
}
@@ -1349,7 +1360,13 @@ static void PyObj_pjsua_transport_config_export(pjsua_transport_config *cfg,
cfg->public_addr = PyString_ToPJ(obj->public_addr);
cfg->bound_addr = PyString_ToPJ(obj->bound_addr);
cfg->port = obj->port;
-
+ cfg->tls_setting.ca_list_file = PyString_ToPJ(obj->tls_ca_list_file);
+ cfg->tls_setting.cert_file = PyString_ToPJ(obj->tls_cert_file);
+ cfg->tls_setting.privkey_file = PyString_ToPJ(obj->tls_privkey_file);
+ cfg->tls_setting.password = PyString_ToPJ(obj->tls_password);
+ cfg->tls_setting.verify_server = obj->tls_verify_server;
+ cfg->tls_setting.verify_client = obj->tls_verify_client;
+ cfg->tls_setting.timeout.sec = obj->tls_timeout;
}
static void PyObj_pjsua_transport_config_import(PyObj_pjsua_transport_config *obj,
@@ -1362,6 +1379,22 @@ static void PyObj_pjsua_transport_config_import(PyObj_pjsua_transport_config *ob
obj->bound_addr = PyString_FromPJ(&cfg->bound_addr);
obj->port = cfg->port;
+
+ Py_XDECREF(obj->tls_ca_list_file);
+ obj->tls_ca_list_file = PyString_FromPJ(&cfg->tls_setting.ca_list_file);
+
+ Py_XDECREF(obj->tls_cert_file);
+ obj->tls_cert_file = PyString_FromPJ(&cfg->tls_setting.cert_file);
+
+ Py_XDECREF(obj->tls_privkey_file);
+ obj->tls_privkey_file = PyString_FromPJ(&cfg->tls_setting.privkey_file);
+
+ Py_XDECREF(obj->tls_password);
+ obj->tls_password = PyString_FromPJ(&cfg->tls_setting.password);
+
+ obj->tls_verify_server = cfg->tls_setting.verify_server;
+ obj->tls_verify_client = cfg->tls_setting.verify_client;
+ obj->tls_timeout = cfg->tls_setting.timeout.sec;
}
@@ -1382,6 +1415,10 @@ static PyObject * PyObj_pjsua_transport_config_new(PyTypeObject *type,
if (self != NULL) {
self->public_addr = PyString_FromString("");
self->bound_addr = PyString_FromString("");
+ self->tls_ca_list_file = PyString_FromString("");
+ self->tls_cert_file = PyString_FromString("");
+ self->tls_privkey_file = PyString_FromString("");
+ self->tls_password = PyString_FromString("");
}
return (PyObject *)self;
@@ -1418,7 +1455,44 @@ static PyMemberDef PyObj_pjsua_transport_config_members[] =
"interface (instead of 0.0.0.0), and SHOULD NOT be used to set the "
"published address of a transport (the public_addr field should be "
"used for that purpose)."
- },
+ },
+ {
+ "tls_ca_list_file", T_OBJECT_EX,
+ offsetof(PyObj_pjsua_transport_config, tls_ca_list_file), 0,
+ "Certificate of Authority (CA) list file."
+ },
+ {
+ "tls_cert_file", T_OBJECT_EX,
+ offsetof(PyObj_pjsua_transport_config, tls_cert_file), 0,
+ "Public endpoint certificate file, which will be used as client- side "
+ "certificate for outgoing TLS connection, and server-side certificate "
+ "for incoming TLS connection."
+ },
+ {
+ "tls_privkey_file", T_OBJECT_EX,
+ offsetof(PyObj_pjsua_transport_config, tls_privkey_file), 0,
+ "Optional private key of the endpoint certificate to be used."
+ },
+ {
+ "tls_password", T_OBJECT_EX,
+ offsetof(PyObj_pjsua_transport_config, tls_password), 0,
+ "Password to open private key."
+ },
+ {
+ "tls_verify_server", T_INT,
+ offsetof(PyObj_pjsua_transport_config, tls_verify_server), 0,
+ "Enables shutdown of the TLS transport if the server certificate can not be verified."
+ },
+ {
+ "tls_verify_client", T_INT,
+ offsetof(PyObj_pjsua_transport_config, tls_verify_client), 0,
+ "Enables shutdown of the TLS transport if the client certificate can not be verified."
+ },
+ {
+ "tls_timeout", T_INT,
+ offsetof(PyObj_pjsua_transport_config, tls_timeout), 0,
+ "TLS negotiation timeout to be applied for both outgoing and incoming connection."
+ },
{NULL} /* Sentinel */
};
commit 382bb4be711be54cf783cc5a40e9050450d69e7a
Merge: eb5da34 d8c7dd2
Author: David M. Lee <dlee at digium.com>
Date: Mon Oct 24 14:40:34 2011 -0500
Merge remote-tracking branch 'integration/fix-oneiric'
commit d8c7dd200994c93820a471388a537b8194d4fa87
Author: David M. Lee <dlee at digium.com>
Date: Mon Oct 24 12:59:00 2011 -0500
Fixed for Ubuntu Oneiric.
In Oneiric, OpenSSL has SSLv2 disabled, which results in link errors
unless you #ifdef appropriately.
diff --git a/pjlib/src/pj/ssl_sock_ossl.c b/pjlib/src/pj/ssl_sock_ossl.c
index f5ccb4c..aabbc5b 100644
--- a/pjlib/src/pj/ssl_sock_ossl.c
+++ b/pjlib/src/pj/ssl_sock_ossl.c
@@ -309,13 +309,24 @@ static pj_status_t init_openssl(void)
STACK_OF(SSL_CIPHER) *sk_cipher;
unsigned i, n;
+#if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3)
meth = (SSL_METHOD*)SSLv23_server_method();
+#endif
+
+#if !defined(OPENSSL_NO_TLS1)
if (!meth)
meth = (SSL_METHOD*)TLSv1_server_method();
+#endif
+
+#if !defined(OPENSSL_NO_SSL3)
if (!meth)
meth = (SSL_METHOD*)SSLv3_server_method();
+#endif
+
+#if !defined(OPENSSL_NO_SSL2)
if (!meth)
meth = (SSL_METHOD*)SSLv2_server_method();
+#endif
pj_assert(meth);
ctx=SSL_CTX_new(meth);
@@ -489,18 +500,26 @@ static pj_status_t create_ssl(pj_ssl_sock_t *ssock)
/* Determine SSL method to use */
switch (ssock->param.proto) {
case PJ_SSL_SOCK_PROTO_DEFAULT:
+#if !defined(OPENSSL_NO_TLS1)
case PJ_SSL_SOCK_PROTO_TLS1:
ssl_method = (SSL_METHOD*)TLSv1_method();
break;
+#endif
+#if !defined(OPENSSL_NO_SSL2)
case PJ_SSL_SOCK_PROTO_SSL2:
ssl_method = (SSL_METHOD*)SSLv2_method();
break;
+#endif
+#if !defined(OPENSSL_NO_SSL3)
case PJ_SSL_SOCK_PROTO_SSL3:
ssl_method = (SSL_METHOD*)SSLv3_method();
break;
+#endif
+#if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3)
case PJ_SSL_SOCK_PROTO_SSL23:
ssl_method = (SSL_METHOD*)SSLv23_method();
break;
+#endif
//case PJ_SSL_SOCK_PROTO_DTLS1:
//ssl_method = (SSL_METHOD*)DTLSv1_method();
//break;
commit eb5da345a860acc74a8c1e38a7a3b2fa498b6599
Author: Joshua Colp <jcolp at digium.com>
Date: Mon Oct 3 19:52:42 2011 -0300
Remove logic which injects media lines that may be missing. What it doesn't know is that it is perfectly acceptable to change the transport of a media stream.
diff --git a/pjmedia/src/pjmedia/sdp_neg.c b/pjmedia/src/pjmedia/sdp_neg.c
index 6263f0c..45a3282 100644
--- a/pjmedia/src/pjmedia/sdp_neg.c
+++ b/pjmedia/src/pjmedia/sdp_neg.c
@@ -283,6 +283,7 @@ PJ_DEF(pj_status_t) pjmedia_sdp_neg_modify_local_offer( pj_pool_t *pool,
* the new offer by reordering and adding the missing media line with
* port number set to zero.
*/
+#if 0
for (oi = 0; oi < old_offer->media_count; ++oi) {
pjmedia_sdp_media *om;
pjmedia_sdp_media *nm;
@@ -308,6 +309,7 @@ PJ_DEF(pj_status_t) pjmedia_sdp_neg_modify_local_offer( pj_pool_t *pool,
break;
}
}
+
if (!found) {
pjmedia_sdp_media *m;
@@ -316,7 +318,9 @@ PJ_DEF(pj_status_t) pjmedia_sdp_neg_modify_local_offer( pj_pool_t *pool,
pj_array_insert(new_offer->media, sizeof(new_offer->media[0]),
new_offer->media_count++, oi, &m);
}
+
}
+#endif
/* New_offer fixed */
neg->initial_sdp = new_offer;
commit 85add862b1de47b94b2e87ed5a10bc2a168a7fba
Author: Brent Eagles <beagles at digium.com>
Date: Fri Sep 16 13:24:18 2011 -0230
Add support for building resampling third party library on Windows
diff --git a/third_party/build/resample/libresample_dll.vcxproj b/third_party/build/resample/libresample_dll.vcxproj
new file mode 100644
index 0000000..d044df3
--- /dev/null
+++ b/third_party/build/resample/libresample_dll.vcxproj
@@ -0,0 +1,429 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug-Dynamic|Win32">
+ <Configuration>Debug-Dynamic</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug-Dynamic|x64">
+ <Configuration>Debug-Dynamic</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug-Static|Win32">
+ <Configuration>Debug-Static</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug-Static|x64">
+ <Configuration>Debug-Static</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release-Dynamic|Win32">
+ <Configuration>Release-Dynamic</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release-Dynamic|x64">
+ <Configuration>Release-Dynamic</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release-Static|Win32">
+ <Configuration>Release-Static</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release-Static|x64">
+ <Configuration>Release-Static</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{C48EAAF5-F69E-410B-9CE4-23AB41B00E2A}</ProjectGuid>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ <UseOfMfc>false</UseOfMfc>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ <UseOfMfc>false</UseOfMfc>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ <UseOfMfc>false</UseOfMfc>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ <UseOfMfc>false</UseOfMfc>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ <UseOfMfc>false</UseOfMfc>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ <UseOfMfc>false</UseOfMfc>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ <UseOfMfc>false</UseOfMfc>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ <UseOfMfc>false</UseOfMfc>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ <UseOfMfc>false</UseOfMfc>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ <UseOfMfc>false</UseOfMfc>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ <UseOfMfc>false</UseOfMfc>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ <UseOfMfc>false</UseOfMfc>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\..\..\build\vs\pjproject-vs8-release-static-defaults.props" />
+ <Import Project="..\..\..\build\vs\pjproject-vs8-win32-release-defaults.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\..\..\build\vs\pjproject-vs8-release-static-defaults.props" />
+ <Import Project="..\..\..\build\vs\pjproject-vs8-win32-release-defaults.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.props" />
+ <Import Project="..\..\..\build\vs\pjproject-vs8-win32-common-defaults.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.props" />
+ <Import Project="..\..\..\build\vs\pjproject-vs8-win32-common-defaults.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\..\..\build\vs\pjproject-vs8-release-dynamic-defaults.props" />
+ <Import Project="..\..\..\build\vs\pjproject-vs8-win32-release-defaults.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\..\..\build\vs\pjproject-vs8-release-dynamic-defaults.props" />
+ <Import Project="..\..\..\build\vs\pjproject-vs8-win32-release-defaults.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\..\..\build\vs\pjproject-vs8-debug-static-defaults.props" />
+ <Import Project="..\..\..\build\vs\pjproject-vs8-win32-common-defaults.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\..\..\build\vs\pjproject-vs8-debug-static-defaults.props" />
+ <Import Project="..\..\..\build\vs\pjproject-vs8-win32-common-defaults.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\..\..\build\vs\pjproject-vs8-release-dynamic-defaults.props" />
+ <Import Project="..\..\..\build\vs\pjproject-vs8-win32-release-defaults.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\..\..\build\vs\pjproject-vs8-release-dynamic-defaults.props" />
+ <Import Project="..\..\..\build\vs\pjproject-vs8-win32-release-defaults.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\..\..\build\vs\pjproject-vs8-debug-static-defaults.props" />
+ <Import Project="..\..\..\build\vs\pjproject-vs8-win32-common-defaults.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\..\..\build\vs\pjproject-vs8-debug-static-defaults.props" />
+ <Import Project="..\..\..\build\vs\pjproject-vs8-win32-common-defaults.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\lib\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\lib\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">..\..\lib\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">..\..\lib\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">..\..\lib\libresample-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">..\..\lib\libresample-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">libresample-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">libresample-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">..\..\lib\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">..\..\lib\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">..\..\lib\libresample-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">..\..\lib\libresample-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">libresample-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">libresample-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\lib\libresample-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\lib\libresample-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">libresample-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">libresample-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">..\..\lib\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">..\..\lib\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">..\..\lib\libresample-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">..\..\lib\libresample-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">libresample-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">libresample-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">..\..\lib\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">..\..\lib\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">..\..\lib\libresample-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">..\..\lib\libresample-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">libresample-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">libresample-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\lib\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\lib\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\lib\libresample-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\lib\libresample-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">libresample-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">libresample-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <PrecompiledHeaderOutputFile>
+ </PrecompiledHeaderOutputFile>
+ <PreprocessorDefinitions>_WINDOWS;_USRDLL;LIBRESAMPLE_DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>.;../../resample/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <OutputFile>$(TargetDir)libresample-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration).dll</OutputFile>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <PrecompiledHeaderOutputFile>
+ </PrecompiledHeaderOutputFile>
+ <PreprocessorDefinitions>_WINDOWS;_USRDLL;LIBRESAMPLE_DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>.;../../resample/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ </ClCompile>
+ <Link>
+ <OutputFile>$(TargetDir)libresample-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration).dll</OutputFile>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <PrecompiledHeaderOutputFile>
+ </PrecompiledHeaderOutputFile>
+ <PreprocessorDefinitions>_WINDOWS;_USRDLL;LIBRESAMPLE_DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>.;../../resample/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <OutputFile>$(TargetDir)libresample-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration).dll</OutputFile>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <PrecompiledHeaderOutputFile>
+ </PrecompiledHeaderOutputFile>
+ <PreprocessorDefinitions>_WINDOWS;_USRDLL;LIBRESAMPLE_DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>.;../../resample/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <OutputFile>$(TargetDir)libresample-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration).dll</OutputFile>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">
+ <ClCompile>
+ <PrecompiledHeaderOutputFile>
+ </PrecompiledHeaderOutputFile>
+ <PreprocessorDefinitions>_WINDOWS;_USRDLL;LIBRESAMPLE_DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>.;../../resample/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <OutputFile>$(TargetDir)libresample-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration).dll</OutputFile>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">
+ <ClCompile>
+ <PrecompiledHeaderOutputFile>
+ </PrecompiledHeaderOutputFile>
+ <PreprocessorDefinitions>_WINDOWS;_USRDLL;LIBRESAMPLE_DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>.;../../resample/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <OutputFile>$(TargetDir)libresample-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration).dll</OutputFile>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">
+ <ClCompile>
+ <PrecompiledHeaderOutputFile>
+ </PrecompiledHeaderOutputFile>
+ <PreprocessorDefinitions>_WINDOWS;_USRDLL;LIBRESAMPLE_DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>.;../../resample/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <OutputFile>$(TargetDir)libresample-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration).dll</OutputFile>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">
+ <ClCompile>
+ <PrecompiledHeaderOutputFile>
+ </PrecompiledHeaderOutputFile>
+ <PreprocessorDefinitions>_WINDOWS;_USRDLL;LIBRESAMPLE_DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>.;../../resample/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <OutputFile>$(TargetDir)libresample-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration).dll</OutputFile>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">
+ <ClCompile>
+ <PrecompiledHeaderOutputFile>
+ </PrecompiledHeaderOutputFile>
+ <PreprocessorDefinitions>_WINDOWS;_USRDLL;LIBRESAMPLE_DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>.;../../resample/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <OutputFile>$(TargetDir)libresample-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration).dll</OutputFile>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">
+ <ClCompile>
+ <PrecompiledHeaderOutputFile>
+ </PrecompiledHeaderOutputFile>
+ <PreprocessorDefinitions>_WINDOWS;_USRDLL;LIBRESAMPLE_DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>.;../../resample/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <OutputFile>$(TargetDir)libresample-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration).dll</OutputFile>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
+ <ClCompile>
+ <PrecompiledHeaderOutputFile>
+ </PrecompiledHeaderOutputFile>
+ <PreprocessorDefinitions>_WINDOWS;_USRDLL;LIBRESAMPLE_DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>.;../../resample/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <OutputFile>$(TargetDir)libresample-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration).dll</OutputFile>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">
+ <ClCompile>
+ <PrecompiledHeaderOutputFile>
+ </PrecompiledHeaderOutputFile>
+ <PreprocessorDefinitions>_WINDOWS;_USRDLL;LIBRESAMPLE_DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>.;../../resample/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <OutputFile>$(TargetDir)libresample-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration).dll</OutputFile>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\resample\src\libresample_dll.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\resample\src\resamplesubs.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\resample\src\largefilter.h" />
+ <ClInclude Include="..\..\resample\src\resample.h" />
+ <ClInclude Include="..\..\resample\include\resamplesubs.h" />
+ <ClInclude Include="..\..\resample\src\smallfilter.h" />
+ <ClInclude Include="..\..\resample\src\stddefs.h" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
commit d0b00a22e2d840431e0bf82ae2980e65ebd36905
Author: Joshua Colp <jcolp at digium.com>
Date: Tue Aug 30 14:48:04 2011 -0300
Provide an easier method of attaching authentication information that does not require a callback.
diff --git a/pjsip/include/pjsip/sip_auth.h b/pjsip/include/pjsip/sip_auth.h
index 57db0e7..e5737fe 100644
--- a/pjsip/include/pjsip/sip_auth.h
+++ b/pjsip/include/pjsip/sip_auth.h
@@ -274,7 +274,7 @@ typedef struct pjsip_auth_srv
pj_str_t realm; /**< Realm to serve. */
pj_bool_t is_proxy; /**< Will issue 407 instead of 401 */
pjsip_auth_lookup_cred *lookup; /**< Lookup function. */
-
+ pjsip_cred_info cred_info; /**< Credentials */
} pjsip_auth_srv;
diff --git a/pjsip/src/pjsip/sip_auth_server.c b/pjsip/src/pjsip/sip_auth_server.c
index 1a557d7..9dce9c9 100644
--- a/pjsip/src/pjsip/sip_auth_server.c
+++ b/pjsip/src/pjsip/sip_auth_server.c
@@ -38,7 +38,7 @@ PJ_DEF(pj_status_t) pjsip_auth_srv_init( pj_pool_t *pool,
pjsip_auth_lookup_cred *lookup,
unsigned options )
{
- PJ_ASSERT_RETURN(pool && auth_srv && realm && lookup, PJ_EINVAL);
+ PJ_ASSERT_RETURN(pool && auth_srv && realm, PJ_EINVAL);
pj_strdup( pool, &auth_srv->realm, realm);
auth_srv->lookup = lookup;
@@ -60,14 +60,12 @@ static pj_status_t pjsip_auth_verify( const pjsip_authorization_hdr *hdr,
pj_str_t digest;
const pjsip_digest_credential *dig = &hdr->credential.digest;
- /* Check that username and realm match.
- * These checks should have been performed before entering this
- * function.
- */
- PJ_ASSERT_RETURN(pj_strcmp(&dig->username, &cred_info->username) == 0,
- PJ_EINVALIDOP);
- PJ_ASSERT_RETURN(pj_strcmp(&dig->realm, &cred_info->realm) == 0,
- PJ_EINVALIDOP);
+ /* Check that username and realm match. */
+ if ((pj_strcmp(&dig->username, &cred_info->username) != 0) ||
+ (pj_strcmp(&dig->realm, &cred_info->realm) != 0))
+ {
+ return PJ_EINVALIDOP;
+ }
/* Prepare for our digest calculation. */
digest.ptr = digest_buf;
@@ -107,7 +105,6 @@ PJ_DEF(pj_status_t) pjsip_auth_srv_verify( pjsip_auth_srv *auth_srv,
pjsip_msg *msg = rdata->msg_info.msg;
pjsip_hdr_e htype;
pj_str_t acc_name;
- pjsip_cred_info cred_info;
pj_status_t status;
PJ_ASSERT_RETURN(auth_srv && rdata, PJ_EINVAL);
@@ -147,17 +144,19 @@ PJ_DEF(pj_status_t) pjsip_auth_srv_verify( pjsip_auth_srv *auth_srv,
return PJSIP_EINVALIDAUTHSCHEME;
}
- /* Find the credential information for the account. */
- status = (*auth_srv->lookup)(rdata->tp_info.pool, &auth_srv->realm,
- &acc_name, &cred_info);
- if (status != PJ_SUCCESS) {
- *status_code = PJSIP_SC_FORBIDDEN;
- return status;
+ if (*auth_srv->lookup) {
+ /* Find the credential information for the account. */
+ status = (*auth_srv->lookup)(rdata->tp_info.pool, &auth_srv->realm,
+ &acc_name, &auth_srv->cred_info);
+ if (status != PJ_SUCCESS) {
+ *status_code = PJSIP_SC_FORBIDDEN;
+ return status;
+ }
}
/* Authenticate with the specified credential. */
status = pjsip_auth_verify(h_auth, &msg->line.req.method.name,
- &cred_info);
+ &auth_srv->cred_info);
if (status != PJ_SUCCESS) {
*status_code = PJSIP_SC_FORBIDDEN;
}
commit d7780631be411856e61d1633e39961e319916307
Author: Joshua Colp <jcolp at digium.com>
Date: Mon Aug 1 20:17:27 2011 -0300
Add ability to delay responding to an INVITE.
diff --git a/pjsip/include/pjsip-ua/sip_inv.h b/pjsip/include/pjsip-ua/sip_inv.h
index ba72ea5..ebd09d3 100644
--- a/pjsip/include/pjsip-ua/sip_inv.h
+++ b/pjsip/include/pjsip-ua/sip_inv.h
@@ -215,6 +215,21 @@ typedef struct pjsip_inv_callback
void (*on_send_ack)(pjsip_inv_session *inv, pjsip_rx_data *rdata);
/**
+ * This callback is called when the framework is going to send a response
+ * to an incoming re-invite. It allows the application to stop or delay
+ * the response until an appropriate time, useful if the local SDP is not
+ * known at the time of reception of the reinvite.
+ *
+ * Application can set the SDP answer with #pjsip_inv_set_sdp_answer().
+ *
+ * The application should eventually call pjsip_inv_send_reinvite_response once
+ * the local SDP has been determined and set using the above.
+ *
+ * This callback is optional.
+ */
+ void (*on_send_reinvite_response)(pjsip_inv_session *inv, pjsip_tx_data *tdata);
+
+ /**
* This callback is called when the session is about to resend the
* INVITE request to the specified target, following the previously
* received redirection response.
@@ -855,6 +870,17 @@ PJ_DECL(pj_status_t) pjsip_inv_create_ack(pjsip_inv_session *inv,
PJ_DECL(pj_status_t) pjsip_inv_send_msg(pjsip_inv_session *inv,
pjsip_tx_data *tdata);
+/**
+ * Send response to reinvite.
+ *
+ * @param inv The invite session.
+ * @param tdata The message to be sent.
+ *
+ * @return PJ_SUCCESS if response could be sent.
+ */
+PJ_DECL(pj_status_t) pjsip_inv_send_reinvite_response(pjsip_inv_session *inv,
+ pjsip_tx_data *tdata);
+
/**
* Get the invite session for the dialog, if any.
diff --git a/pjsip/src/pjsip-ua/sip_inv.c b/pjsip/src/pjsip-ua/sip_inv.c
index 104d841..884b523 100644
--- a/pjsip/src/pjsip-ua/sip_inv.c
+++ b/pjsip/src/pjsip-ua/sip_inv.c
@@ -2636,6 +2636,52 @@ PJ_DEF(pj_status_t) pjsip_inv_send_msg( pjsip_inv_session *inv,
return PJ_SUCCESS;
}
+/**
+ * Send a response to a reinvite.
+ */
+PJ_DEF(pj_status_t) pjsip_inv_send_reinvite_response(pjsip_inv_session *inv,
+ pjsip_tx_data *tdata)
+{
+ pj_status_t status;
+
+ // Perform SDP negotiation so our SDP will get added to the answer
+ status = process_answer(inv, 200, tdata, NULL);
+
+ if (status != PJ_SUCCESS) {
+ /*
+ * SDP negotiation has failed.
+ */
+ pj_status_t rc;
+ pj_str_t reason;
+
+ /* Create 500 response */
+ reason = pj_str("SDP negotiation failed");
+ rc = pjsip_dlg_modify_response(inv->dlg, tdata, 500, &reason);
+ if (rc == PJ_SUCCESS) {
+ pjsip_warning_hdr *w;
+ const pj_str_t *endpt_name;
+
+ endpt_name = pjsip_endpt_name(inv->dlg->endpt);
+ w = pjsip_warning_hdr_create_from_status(tdata->pool,
+ endpt_name,
+ status);
+ if (w)
+ pjsip_msg_add_hdr(tdata->msg, (pjsip_hdr*)w);
+
+ pjsip_inv_send_msg(inv, tdata);
+ }
+ return rc;
+ }
+
+ /* Invoke Session Timers */
+ pjsip_timer_update_resp(inv, tdata);
+
+ /* Send 2xx regardless of the status of negotiation */
+ status = pjsip_inv_send_msg(inv, tdata);
+
+ return status;
+}
+
/*
* Respond to incoming CANCEL request.
@@ -3978,6 +4024,10 @@ static void inv_on_state_confirmed( pjsip_inv_session *inv, pjsip_event *e)
*/
sdp_info = pjsip_rdata_get_sdp_info(rdata);
if (sdp_info->sdp != NULL) {
+ if (mod_inv.cb.on_send_reinvite_response) {
+ (*mod_inv.cb.on_send_reinvite_response)(inv, tdata);
+ return;
+ }
status = process_answer(inv, 200, tdata, NULL);
} else {
/* INVITE does not have SDP.
commit 6360b96e03e5cf651d5b310f0303db101cd1832d
Author: Ken Hunt <ken.hunt at digium.com>
Date: Fri Jun 3 15:46:06 2011 -0500
Moved alteration of a thread's default stack size into config_site.h
diff --git a/pjlib/include/pj/config_site.h b/pjlib/include/pj/config_site.h
index c0a3391..8d63684 100644
--- a/pjlib/include/pj/config_site.h
+++ b/pjlib/include/pj/config_site.h
@@ -16,6 +16,18 @@
#undef _WIN32_WINNT
#define _WIN32_WINNT PJ_WIN32_WINNT
+#ifdef PJ_THREAD_DEFAULT_STACK_SIZE
+#undef PJ_THREAD_DEFAULT_STACK_SIZE
#endif
+// We're going to assume that we need twice the default stack
+// size for Windows since we're targetting 64-bit platforms.
+// This is a temporary fix until we refactor the thread code
+// to use beginthreadex(...) instead of CreateThread(...) for
+// Windows threads.
+#define PJ_THREAD_DEFAULT_STACK_SIZE 16384
+
+#endif // PJ_WIN32
+
+
diff --git a/pjlib/src/pj/os_core_win32.c b/pjlib/src/pj/os_core_win32.c
index 387d79c..0c43fd2 100644
--- a/pjlib/src/pj/os_core_win32.c
+++ b/pjlib/src/pj/os_core_win32.c
@@ -605,11 +605,18 @@ PJ_DEF(pj_status_t) pj_thread_sleep(unsigned msec)
PJ_DEF(void) pj_thread_check_stack(const char *file, int line)
{
char stk_ptr;
+ unsigned long stk_start;
+ unsigned long std_ptr_addr;
+ unsigned long stk_size;
pj_uint32_t usage;
pj_thread_t *thread = pj_thread_this();
pj_assert(thread);
+ std_ptr_addr = (unsigned long)&stk_ptr;
+ stk_start = (unsigned long)thread->stk_start;
+ stk_size = (unsigned long)thread->stk_size;
+
/* Calculate current usage. */
usage = (&stk_ptr > thread->stk_start) ? &stk_ptr - thread->stk_start :
thread->stk_start - &stk_ptr;
commit 101d37e6e300cf893c937fc9351bbdc67b129f4d
Author: Brent Eagles <beagles at digium.com>
Date: Wed Jun 1 22:33:20 2011 -0230
Upping default stack size to deal with x64 platform.
diff --git a/pjlib/include/pj/config.h b/pjlib/include/pj/config.h
index aeeb47f..929acab 100644
--- a/pjlib/include/pj/config.h
+++ b/pjlib/include/pj/config.h
@@ -450,7 +450,7 @@
* Default: 8192
*/
#ifndef PJ_THREAD_DEFAULT_STACK_SIZE
-# define PJ_THREAD_DEFAULT_STACK_SIZE 8192
+# define PJ_THREAD_DEFAULT_STACK_SIZE 8192 * (sizeof(long*)/sizeof(long))
#endif
commit 5b7e532adec4a705015a19584591b538d1bd2108
Author: Ken Hunt <ken.hunt at digium.com>
Date: Tue May 31 08:35:48 2011 -0500
Changes for IPv6 handling for Windows. The socket.h file assumed
IPPROTO_IPV6 is a macro definition. It became an enumerator as of
Vista/Window Server 2008.
diff --git a/pjlib/include/pj/compat/socket.h b/pjlib/include/pj/compat/socket.h
index bcad5b4..d7165ec 100644
--- a/pjlib/include/pj/compat/socket.h
+++ b/pjlib/include/pj/compat/socket.h
@@ -57,14 +57,17 @@
* = Visual Studio 2003, 2005 (including Express) =
*
* These VS uses Microsoft Platform SDK for Windows Server 2003 SP1, and
- * it has built-in IPv6 support.
+ * it has built-in IPv6 support.
*/
#if defined(_MSC_VER) && defined(PJ_HAS_IPV6) && PJ_HAS_IPV6!=0
# ifndef s_addr
# define s_addr S_un.S_addr
# endif
-# if !defined(IPPROTO_IPV6)
+ /* Note: Added test _WIN32_WINNT version. IPPROTO_IPV6
+ * is an enum, not a macro, in more recent versions.
+ */
+# if (_WIN32_WINNT < 0x0600) && !defined(IPPROTO_IPV6)
/* Need to download and install IPv6Kit for this platform.
* Please see the comments above about Visual Studio 6.
*/
diff --git a/pjlib/include/pj/config_site.h b/pjlib/include/pj/config_site.h
index e69de29..c0a3391 100644
--- a/pjlib/include/pj/config_site.h
+++ b/pjlib/include/pj/config_site.h
@@ -0,0 +1,21 @@
+
+#pragma once
+
+#ifdef PJ_WIN32
+
+// _WIN32_WINNT mapping to versions
+// 0x0500 : Windows 2000
+// 0x0501 : Windows Server 2003, Windows XP
+// 0x0502 : Windows Server 2003 w/ SP1, Windows XP w/ SP2
+// 0x0600 : Windows Vista, Windows Server 2008
+// 0x0601 : Windows 7
+
+#undef PJ_WIN32_WINNT
+#define PJ_WIN32_WINNT 0x0600
+
+#undef _WIN32_WINNT
+#define _WIN32_WINNT PJ_WIN32_WINNT
+
+#endif
+
+
commit 651de29bbf38bb852937a256dc12ce606e5a68b6
Author: Joshua Colp <jcolp at digium.com>
Date: Thu May 26 12:45:42 2011 -0300
Enable IPv6 support by default. This can't be done in config_site.h because it is overwritten as part of the build process, so here is fine.
diff --git a/pjlib/include/pj/config.h b/pjlib/include/pj/config.h
index 4ed9d3f..aeeb47f 100644
--- a/pjlib/include/pj/config.h
+++ b/pjlib/include/pj/config.h
@@ -489,10 +489,10 @@
* Support IPv6 in the library. If this support is disabled, some IPv6
* related functions will return PJ_EIPV6NOTSUP.
*
- * Default: 0 (disabled, for now)
+ * Default: 1 (enabled)
*/
#ifndef PJ_HAS_IPV6
-# define PJ_HAS_IPV6 0
+# define PJ_HAS_IPV6 1
#endif
/**
commit 7def17f750b248e8674ad3c4cc8def1fbf309413
Author: Ken Hunt <ken.hunt at digium.com>
Date: Wed May 18 11:49:06 2011 -0500
Added empty config_site.h
diff --git a/pjlib/include/pj/config_site.h b/pjlib/include/pj/config_site.h
new file mode 100644
index 0000000..e69de29
commit 78a1f576fd6c42753dc0aa72b55f66763ab4d3f2
Author: David M. Lee <dlee at digium.com>
Date: Tue May 10 14:47:46 2011 -0500
.gitignore *.vcxproj.user
diff --git a/.gitignore b/.gitignore
index 5ac6e37..37e36d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
*-auto.mak
*.depend
+*.vcxproj.user
*_auto.h
build.mak
config.log
commit 31cf1966b3c276381ca465fb14b052c9b71227ee
Author: David M. Lee <dlee at digium.com>
Date: Tue May 10 14:46:38 2011 -0500
sort .gitignore
diff --git a/.gitignore b/.gitignore
index 9651443..5ac6e37 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,8 @@
+*-auto.mak
*.depend
+*_auto.h
+build.mak
config.log
config.status
-*-auto.mak
-*_auto.h
pjlib/include/pj/config_site.h
pjsip/include/pjsip/sip_autoconf.h
-build.mak
commit b9330117c0e7bceaff0a3500a5e589f37c8282b7
Author: Brent Eagles <beagles at digium.com>
Date: Wed May 4 17:29:31 2011 -0230
Undo some of the changes that were introduced in a previous commit. Having
pj_sock_t be defined in terms of SOCKET required winsock2.h be included
indirectly in several locations. This caused lots of header file ordering
headaches in code that also include Ice related header files.
diff --git a/pjlib/include/pj/compat/socket.h b/pjlib/include/pj/compat/socket.h
index d50a9aa..bcad5b4 100644
--- a/pjlib/include/pj/compat/socket.h
+++ b/pjlib/include/pj/compat/socket.h
@@ -25,7 +25,7 @@
* @brief Provides all socket related functions,data types, error codes, etc.
*/
-#if defined(PJ_HAS_WINSOCK2_H) && PJ_HAS_WINSOCK2_H != 0
+#if defined(PJ_HAS_WINSOCK2_H) && PJ_HAS_WINSOCK2_H != 0
# include <winsock2.h>
#endif
diff --git a/pjlib/include/pj/sock.h b/pjlib/include/pj/sock.h
index be8230d..a12cd42 100644
--- a/pjlib/include/pj/sock.h
+++ b/pjlib/include/pj/sock.h
@@ -460,11 +460,7 @@ typedef enum pj_socket_sd_type
* Constant for invalid socket returned by #pj_sock_socket() and
* #pj_sock_accept().
*/
-#ifdef PJ_WIN32
-#define PJ_INVALID_SOCKET INVALID_SOCKET
-#else
#define PJ_INVALID_SOCKET (-1)
-#endif
/* Must undefine s_addr because of pj_in_addr below */
#undef s_addr
diff --git a/pjlib/include/pj/types.h b/pjlib/include/pj/types.h
index 0b8e21d..7cc723b 100644
--- a/pjlib/include/pj/types.h
+++ b/pjlib/include/pj/types.h
@@ -31,7 +31,6 @@
* @{
*/
#include <pj/config.h>
-#include <pj/compat/socket.h>
PJ_BEGIN_DECL
@@ -253,8 +252,13 @@ typedef struct pj_pipe_t pj_pipe_t;
typedef void *pj_oshandle_t;
/** Socket handle. */
-#ifdef PJ_WIN32
-typedef SOCKET pj_sock_t;
+
+/**
+ * This is a portability thing. We don't want to pull in all of Winsock here because
+ * it calls all sorts of issues.
+ */
+#if defined(PJ_WIN32) && defined(_M_X64)
+typedef __int64 pj_sock_t;
#else
typedef long pj_sock_t;
#endif
commit ffc2cd55c8c978d40b0d3848a82df7466d717122
Author: Brent Eagles <beagles at digium.com>
Date: Mon Apr 25 13:20:37 2011 -0230
Some modifications so the pjproject functions properly on x64 targets.
diff --git a/pjlib/include/pj/pool.h b/pjlib/include/pj/pool.h
index d8225cb..a8bdb05 100644
--- a/pjlib/include/pj/pool.h
+++ b/pjlib/include/pj/pool.h
@@ -856,7 +856,7 @@ struct pj_caching_pool
/**
* Internal pool.
*/
- char pool_buf[256 * (sizeof(long) / 4)];
+ char pool_buf[256 * (sizeof(int*) / 4)];
/**
* Mutex.
diff --git a/pjlib/include/pj/sock.h b/pjlib/include/pj/sock.h
index a12cd42..be8230d 100644
--- a/pjlib/include/pj/sock.h
+++ b/pjlib/include/pj/sock.h
@@ -460,7 +460,11 @@ typedef enum pj_socket_sd_type
* Constant for invalid socket returned by #pj_sock_socket() and
* #pj_sock_accept().
*/
+#ifdef PJ_WIN32
+#define PJ_INVALID_SOCKET INVALID_SOCKET
+#else
#define PJ_INVALID_SOCKET (-1)
+#endif
/* Must undefine s_addr because of pj_in_addr below */
#undef s_addr
diff --git a/pjlib/include/pj/types.h b/pjlib/include/pj/types.h
index 9c43f93..0b8e21d 100644
--- a/pjlib/include/pj/types.h
+++ b/pjlib/include/pj/types.h
@@ -31,6 +31,7 @@
* @{
*/
#include <pj/config.h>
+#include <pj/compat/socket.h>
PJ_BEGIN_DECL
@@ -252,7 +253,11 @@ typedef struct pj_pipe_t pj_pipe_t;
typedef void *pj_oshandle_t;
/** Socket handle. */
+#ifdef PJ_WIN32
+typedef SOCKET pj_sock_t;
+#else
typedef long pj_sock_t;
+#endif
/** Generic socket address. */
typedef void pj_sockaddr_t;
diff --git a/pjlib/src/pj/sock_bsd.c b/pjlib/src/pj/sock_bsd.c
index 1554af8..7e9e108 100644
--- a/pjlib/src/pj/sock_bsd.c
+++ b/pjlib/src/pj/sock_bsd.c
@@ -486,7 +486,7 @@ PJ_DEF(pj_status_t) pj_sock_socket(int af,
/* Sanity checks. */
PJ_ASSERT_RETURN(sock!=NULL, PJ_EINVAL);
- PJ_ASSERT_RETURN((unsigned)PJ_INVALID_SOCKET==INVALID_SOCKET,
+ PJ_ASSERT_RETURN(PJ_INVALID_SOCKET==INVALID_SOCKET,
(*sock=PJ_INVALID_SOCKET, PJ_EINVAL));
*sock = WSASocket(af, type, proto, NULL, 0, WSA_FLAG_OVERLAPPED);
diff --git a/third_party/build/srtp/libsrtp.vcxproj b/third_party/build/srtp/libsrtp.vcxproj
index c709720..083cf0b 100644
--- a/third_party/build/srtp/libsrtp.vcxproj
+++ b/third_party/build/srtp/libsrtp.vcxproj
@@ -112,7 +112,7 @@
<AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;PJ_M_X86_64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeaderOutputFile>.\output\libsrtp-$(PlatformShortName)-$(Platform)-vs2010-$(Configuration)/libsrtp.pch</PrecompiledHeaderOutputFile>
<AssemblerListingLocation>.\output\libsrtp-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</AssemblerListingLocation>
<ObjectFileName>.\output\libsrtp-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ObjectFileName>
commit 145326a69b1137a7387ecabf1036e7347da91b47
Author: Brent Eagles <beagles at digium.com>
Date: Fri Apr 8 15:31:55 2011 -0230
- Change C runtime libraries to DLL for some projects (/MT(d)->/MD(d))
- Add x64 build target.
- Change several project options to use configuration macros instead
of hardcoded values.
diff --git a/pjlib-util/build/pjlib_util.vcxproj b/pjlib-util/build/pjlib_util.vcxproj
index e0a0913..face153 100644
--- a/pjlib-util/build/pjlib_util.vcxproj
+++ b/pjlib-util/build/pjlib_util.vcxproj
@@ -5,10 +5,18 @@
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{3944DE2F-8240-48CE-9CC8-292697BD6BB7}</ProjectGuid>
@@ -19,11 +27,21 @@
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
@@ -31,19 +49,33 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+ </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../lib/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../lib/pjlib-util-i386-win32-vc10-release\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../lib/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../lib/pjlib-util-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../lib/pjlib-util-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../lib/</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../lib/pjlib-util-i386-win32-vc10-debug\</IntDir>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pjlib-util-i386-win32-vc10-debug</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">pjlib-util-i386-win32-vc10-release</TargetName>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../lib/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../lib/pjlib-util-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../lib/pjlib-util-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pjlib-util-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pjlib-util-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">pjlib-util-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pjlib-util-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
@@ -54,10 +86,10 @@
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>.\./output/pjlib-util-i386-win32-vc6-release/pjlib_util.pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>.\./output/pjlib-util-i386-win32-vc6-release/</AssemblerListingLocation>
- <ObjectFileName>.\./output/pjlib-util-i386-win32-vc6-release/</ObjectFileName>
- <ProgramDataBaseFileName>.\./output/pjlib-util-i386-win32-vc6-release/</ProgramDataBaseFileName>
+ <PrecompiledHeaderOutputFile>.\./output/pjlib-util-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjlib_util.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>.\./output/pjlib-util-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</AssemblerListingLocation>
+ <ObjectFileName>.\./output/pjlib-util-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ObjectFileName>
+ <ProgramDataBaseFileName>.\./output/pjlib-util-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ProgramDataBaseFileName>
<BrowseInformation>true</BrowseInformation>
<WarningLevel>Level4</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
@@ -72,7 +104,37 @@
</Lib>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>.\./output/pjlib-util-i386-win32-vc6-release/pjlib_util.bsc</OutputFile>
+ <OutputFile>.\./output/pjlib-util-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjlib_util.bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>NDEBUG;WIN32;_LIB;PJ_WIN32=1;PJ_M_X86_64=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>.\./output/pjlib-util-$(PlatformShortName)-$(Platform)-vs2010-$(Configuration)/pjlib_util.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>.\./output/pjlib-util-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</AssemblerListingLocation>
+ <ObjectFileName>.\./output/pjlib-util-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ObjectFileName>
+ <ProgramDataBaseFileName>.\./output/pjlib-util-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ProgramDataBaseFileName>
+ <BrowseInformation>true</BrowseInformation>
+ <WarningLevel>Level4</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Lib>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Lib>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\./output/pjlib-util-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjlib_util.bsc</OutputFile>
</Bscmake>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -83,10 +145,10 @@
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>.\./output/pjlib-util-i386-win32-vc6-debug/pjlib_util.pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>.\./output/pjlib-util-i386-win32-vc6-debug/</AssemblerListingLocation>
- <ObjectFileName>.\./output/pjlib-util-i386-win32-vc6-debug/</ObjectFileName>
- <ProgramDataBaseFileName>.\./output/pjlib-util-i386-win32-vc6-debug/</ProgramDataBaseFileName>
+ <PrecompiledHeaderOutputFile>.\./output/pjlib-util-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjlib_util.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>.\./output/pjlib-util-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</AssemblerListingLocation>
+ <ObjectFileName>.\./output/pjlib-util-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ObjectFileName>
+ <ProgramDataBaseFileName>.\./output/pjlib-util-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ProgramDataBaseFileName>
<BrowseInformation>true</BrowseInformation>
<WarningLevel>Level4</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
@@ -101,151 +163,275 @@
</Lib>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>.\./output/pjlib-util-i386-win32-vc6-debug/pjlib_util.bsc</OutputFile>
+ <OutputFile>.\./output/pjlib-util-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjlib_util.bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_DEBUG;WIN32;_LIB;PJ_WIN32=1;PJ_M_X86_64=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>.\./output/pjlib-util-$(PlatformShortName)-$(Platform)-vs2010-$(Configuration)/pjlib_util.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>.\./output/pjlib-util-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</AssemblerListingLocation>
+ <ObjectFileName>.\./output/pjlib-util-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ObjectFileName>
+ <ProgramDataBaseFileName>.\./output/pjlib-util-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ProgramDataBaseFileName>
+ <BrowseInformation>true</BrowseInformation>
+ <WarningLevel>Level4</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Lib>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Lib>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\./output/pjlib-util-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjlib_util.bsc</OutputFile>
</Bscmake>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\src\pjlib-util\base64.c">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\src\pjlib-util\crc32.c">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\src\pjlib-util\dns.c">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\src\pjlib-util\dns_dump.c">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\src\pjlib-util\dns_server.c">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\src\pjlib-util\errno.c">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\src\pjlib-util\getopt.c">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\src\pjlib-util\hmac_md5.c">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\src\pjlib-util\hmac_sha1.c">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\src\pjlib-util\http_client.c">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\src\pjlib-util\md5.c">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\src\pjlib-util\pcap.c">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\src\pjlib-util\resolver.c">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\src\pjlib-util\scanner.c">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\src\pjlib-util\scanner_cis_bitwise.c">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\src\pjlib-util\scanner_cis_uint.c">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\src\pjlib-util\sha1.c">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\src\pjlib-util\srv_resolver.c">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\src\pjlib-util\string.c">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\src\pjlib-util\stun_simple.c">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\src\pjlib-util\stun_simple_client.c">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\src\pjlib-util\symbols.c">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\src\pjlib-util\xml.c">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemGroup>
<ItemGroup>
diff --git a/pjlib/build/pjlib.vcxproj b/pjlib/build/pjlib.vcxproj
index dee86d7..df52697 100644
--- a/pjlib/build/pjlib.vcxproj
+++ b/pjlib/build/pjlib.vcxproj
@@ -5,10 +5,18 @@
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{8E99589D-1DD0-4AA0-9D54-736FDD24A26D}</ProjectGuid>
@@ -19,11 +27,21 @@
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
@@ -31,19 +49,33 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+ </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\pjlib-i386-win32-vc10-debug\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\lib\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\pjlib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\lib\pjlib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\pjlib-i386-win32-vc10-release\</IntDir>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)-i386-win32-vc10-debug</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)-i386-win32-vc10-release</TargetName>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\lib\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\pjlib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\lib\pjlib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -53,10 +85,10 @@
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <PrecompiledHeaderOutputFile>.\output\pjlib-i386-win32-vc6-debug/pjlib.pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>.\output\pjlib-i386-win32-vc6-debug/</AssemblerListingLocation>
- <ObjectFileName>.\output\pjlib-i386-win32-vc6-debug/</ObjectFileName>
- <ProgramDataBaseFileName>.\output\pjlib-i386-win32-vc6-debug/</ProgramDataBaseFileName>
+ <PrecompiledHeaderOutputFile>.\output\pjlib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjlib.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>.\output\pjlib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</AssemblerListingLocation>
+ <ObjectFileName>.\output\pjlib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ObjectFileName>
+ <ProgramDataBaseFileName>.\output\pjlib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ProgramDataBaseFileName>
<BrowseInformation>true</BrowseInformation>
<WarningLevel>Level4</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
@@ -71,7 +103,35 @@
</Lib>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>.\output\pjlib-i386-win32-vc6-debug/pjlib.bsc</OutputFile>
+ <OutputFile>.\output\pjlib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjlib.bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_DEBUG;WIN32;_LIB;PJ_WIN32;PJ_M_X86_64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>.\output\pjlib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjlib.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>.\output\pjlib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</AssemblerListingLocation>
+ <ObjectFileName>.\output\pjlib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ObjectFileName>
+ <ProgramDataBaseFileName>.\output\pjlib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ProgramDataBaseFileName>
... 11614 lines suppressed ...
--
asterisk-scf/integration/pjproject.git
More information about the asterisk-scf-commits
mailing list