From ffc65c1f90f685e98f2f6d0a5d72c661b69cb3df Mon Sep 17 00:00:00 2001 From: pescuma Date: Thu, 7 Jan 2010 02:10:02 +0000 Subject: sip: 0.1.1.0 + Build with vc6 * Fix for wrong voice service version git-svn-id: http://pescuma.googlecode.com/svn/trunk/Miranda@207 c086bb3d-8645-0410-b8da-73a8550f86e7 --- Protocols/SIP/Docs/sip_changelog.txt | 4 ++++ Protocols/SIP/Docs/sip_version.txt | 2 +- Protocols/SIP/SIPProto.cpp | 21 ++++++++++++++------- Protocols/SIP/build/rakefile | 8 ++++++-- Protocols/SIP/commons.h | 1 + Protocols/SIP/lib/openssl/lib/libeay32MDd.lib | Bin 0 -> 3590608 bytes Protocols/SIP/lib/openssl/lib/libeay32MT.lib | Bin 0 -> 3802436 bytes Protocols/SIP/lib/openssl/lib/ssleay32MDd.lib | Bin 0 -> 673286 bytes Protocols/SIP/lib/openssl/lib/ssleay32MT.lib | Bin 0 -> 657780 bytes .../lib/vc6/libg7221codec-i386-win32-vc6-debug.lib | Bin 0 -> 203450 bytes .../vc6/libg7221codec-i386-win32-vc6-release.lib | Bin 0 -> 77956 bytes .../lib/vc6/libgsmcodec-i386-win32-vc6-debug.lib | Bin 0 -> 144268 bytes .../lib/vc6/libgsmcodec-i386-win32-vc6-release.lib | Bin 0 -> 46850 bytes .../lib/vc6/libilbccodec-i386-win32-vc6-debug.lib | Bin 0 -> 172490 bytes .../vc6/libilbccodec-i386-win32-vc6-release.lib | Bin 0 -> 76962 bytes .../lib/vc6/libmilenage-i386-win32-vc6-debug.lib | Bin 0 -> 26864 bytes .../lib/vc6/libmilenage-i386-win32-vc6-release.lib | Bin 0 -> 18004 bytes .../lib/vc6/libportaudio-i386-win32-vc6-debug.lib | Bin 0 -> 485508 bytes .../vc6/libportaudio-i386-win32-vc6-release.lib | Bin 0 -> 183620 bytes .../lib/vc6/libresample-i386-win32-vc6-debug.lib | Bin 0 -> 56748 bytes .../lib/vc6/libresample-i386-win32-vc6-release.lib | Bin 0 -> 48926 bytes .../lib/vc6/libspeex-i386-win32-vc6-debug.lib | Bin 0 -> 594242 bytes .../lib/vc6/libspeex-i386-win32-vc6-release.lib | Bin 0 -> 243218 bytes .../pjsip/lib/vc6/libsrtp-i386-win32-vc6-debug.lib | Bin 0 -> 426640 bytes .../lib/vc6/libsrtp-i386-win32-vc6-release.lib | Bin 0 -> 159524 bytes .../pjsip/lib/vc6/pjlib-i386-win32-vc6-debug.lib | Bin 0 -> 904872 bytes .../pjsip/lib/vc6/pjlib-i386-win32-vc6-release.lib | Bin 0 -> 600282 bytes .../lib/vc6/pjlib-util-i386-win32-vc6-debug.lib | Bin 0 -> 392034 bytes .../lib/vc6/pjlib-util-i386-win32-vc6-release.lib | Bin 0 -> 241000 bytes .../vc6/pjmedia-audiodev-i386-win32-vc6-debug.lib | Bin 0 -> 136708 bytes .../pjmedia-audiodev-i386-win32-vc6-release.lib | Bin 0 -> 90654 bytes .../lib/vc6/pjmedia-codec-i386-win32-vc6-debug.lib | Bin 0 -> 229800 bytes .../vc6/pjmedia-codec-i386-win32-vc6-release.lib | Bin 0 -> 126936 bytes .../pjsip/lib/vc6/pjmedia-i386-win32-vc6-debug.lib | Bin 0 -> 1389216 bytes .../lib/vc6/pjmedia-i386-win32-vc6-release.lib | Bin 0 -> 823546 bytes .../pjsip/lib/vc6/pjnath-i386-win32-vc6-debug.lib | Bin 0 -> 682956 bytes .../lib/vc6/pjnath-i386-win32-vc6-release.lib | Bin 0 -> 246812 bytes .../lib/vc6/pjsip-core-i386-win32-vc6-debug.lib | Bin 0 -> 1240214 bytes .../lib/vc6/pjsip-core-i386-win32-vc6-release.lib | Bin 0 -> 839010 bytes .../lib/vc6/pjsip-simple-i386-win32-vc6-debug.lib | Bin 0 -> 350182 bytes .../vc6/pjsip-simple-i386-win32-vc6-release.lib | Bin 0 -> 241524 bytes .../lib/vc6/pjsip-ua-i386-win32-vc6-debug.lib | Bin 0 -> 370686 bytes .../lib/vc6/pjsip-ua-i386-win32-vc6-release.lib | Bin 0 -> 230196 bytes .../lib/vc6/pjsua-lib-i386-win32-vc6-debug.lib | Bin 0 -> 678502 bytes .../lib/vc6/pjsua-lib-i386-win32-vc6-release.lib | Bin 0 -> 501250 bytes .../SIP/lib/pjsip/pjlib/include/pj/config_site.h | 10 ++++++++++ Protocols/SIP/lib/pjsip/pjlib/include/pj/timer.h | 6 +----- .../lib/pjsip/pjnath/include/pjnath/ice_strans.h | 13 ++++++++++++- .../lib/pjsip/pjnath/include/pjnath/turn_session.h | 12 ++++++++++-- Protocols/SIP/sip.cpp | 2 +- Protocols/SIP/sip.dsp | 16 ++++++++-------- 51 files changed, 68 insertions(+), 27 deletions(-) create mode 100644 Protocols/SIP/lib/openssl/lib/libeay32MDd.lib create mode 100644 Protocols/SIP/lib/openssl/lib/libeay32MT.lib create mode 100644 Protocols/SIP/lib/openssl/lib/ssleay32MDd.lib create mode 100644 Protocols/SIP/lib/openssl/lib/ssleay32MT.lib create mode 100644 Protocols/SIP/lib/pjsip/lib/vc6/libg7221codec-i386-win32-vc6-debug.lib create mode 100644 Protocols/SIP/lib/pjsip/lib/vc6/libg7221codec-i386-win32-vc6-release.lib create mode 100644 Protocols/SIP/lib/pjsip/lib/vc6/libgsmcodec-i386-win32-vc6-debug.lib create mode 100644 Protocols/SIP/lib/pjsip/lib/vc6/libgsmcodec-i386-win32-vc6-release.lib create mode 100644 Protocols/SIP/lib/pjsip/lib/vc6/libilbccodec-i386-win32-vc6-debug.lib create mode 100644 Protocols/SIP/lib/pjsip/lib/vc6/libilbccodec-i386-win32-vc6-release.lib create mode 100644 Protocols/SIP/lib/pjsip/lib/vc6/libmilenage-i386-win32-vc6-debug.lib create mode 100644 Protocols/SIP/lib/pjsip/lib/vc6/libmilenage-i386-win32-vc6-release.lib create mode 100644 Protocols/SIP/lib/pjsip/lib/vc6/libportaudio-i386-win32-vc6-debug.lib create mode 100644 Protocols/SIP/lib/pjsip/lib/vc6/libportaudio-i386-win32-vc6-release.lib create mode 100644 Protocols/SIP/lib/pjsip/lib/vc6/libresample-i386-win32-vc6-debug.lib create mode 100644 Protocols/SIP/lib/pjsip/lib/vc6/libresample-i386-win32-vc6-release.lib create mode 100644 Protocols/SIP/lib/pjsip/lib/vc6/libspeex-i386-win32-vc6-debug.lib create mode 100644 Protocols/SIP/lib/pjsip/lib/vc6/libspeex-i386-win32-vc6-release.lib create mode 100644 Protocols/SIP/lib/pjsip/lib/vc6/libsrtp-i386-win32-vc6-debug.lib create mode 100644 Protocols/SIP/lib/pjsip/lib/vc6/libsrtp-i386-win32-vc6-release.lib create mode 100644 Protocols/SIP/lib/pjsip/lib/vc6/pjlib-i386-win32-vc6-debug.lib create mode 100644 Protocols/SIP/lib/pjsip/lib/vc6/pjlib-i386-win32-vc6-release.lib create mode 100644 Protocols/SIP/lib/pjsip/lib/vc6/pjlib-util-i386-win32-vc6-debug.lib create mode 100644 Protocols/SIP/lib/pjsip/lib/vc6/pjlib-util-i386-win32-vc6-release.lib create mode 100644 Protocols/SIP/lib/pjsip/lib/vc6/pjmedia-audiodev-i386-win32-vc6-debug.lib create mode 100644 Protocols/SIP/lib/pjsip/lib/vc6/pjmedia-audiodev-i386-win32-vc6-release.lib create mode 100644 Protocols/SIP/lib/pjsip/lib/vc6/pjmedia-codec-i386-win32-vc6-debug.lib create mode 100644 Protocols/SIP/lib/pjsip/lib/vc6/pjmedia-codec-i386-win32-vc6-release.lib create mode 100644 Protocols/SIP/lib/pjsip/lib/vc6/pjmedia-i386-win32-vc6-debug.lib create mode 100644 Protocols/SIP/lib/pjsip/lib/vc6/pjmedia-i386-win32-vc6-release.lib create mode 100644 Protocols/SIP/lib/pjsip/lib/vc6/pjnath-i386-win32-vc6-debug.lib create mode 100644 Protocols/SIP/lib/pjsip/lib/vc6/pjnath-i386-win32-vc6-release.lib create mode 100644 Protocols/SIP/lib/pjsip/lib/vc6/pjsip-core-i386-win32-vc6-debug.lib create mode 100644 Protocols/SIP/lib/pjsip/lib/vc6/pjsip-core-i386-win32-vc6-release.lib create mode 100644 Protocols/SIP/lib/pjsip/lib/vc6/pjsip-simple-i386-win32-vc6-debug.lib create mode 100644 Protocols/SIP/lib/pjsip/lib/vc6/pjsip-simple-i386-win32-vc6-release.lib create mode 100644 Protocols/SIP/lib/pjsip/lib/vc6/pjsip-ua-i386-win32-vc6-debug.lib create mode 100644 Protocols/SIP/lib/pjsip/lib/vc6/pjsip-ua-i386-win32-vc6-release.lib create mode 100644 Protocols/SIP/lib/pjsip/lib/vc6/pjsua-lib-i386-win32-vc6-debug.lib create mode 100644 Protocols/SIP/lib/pjsip/lib/vc6/pjsua-lib-i386-win32-vc6-release.lib (limited to 'Protocols') diff --git a/Protocols/SIP/Docs/sip_changelog.txt b/Protocols/SIP/Docs/sip_changelog.txt index a3557ef..aa10628 100644 --- a/Protocols/SIP/Docs/sip_changelog.txt +++ b/Protocols/SIP/Docs/sip_changelog.txt @@ -2,5 +2,9 @@ SIP protocol Changelog: +. 0.1.1.0 + + Build with vc6 + * Fix for wrong voice service version + . 0.1.0.0 + Initial version \ No newline at end of file diff --git a/Protocols/SIP/Docs/sip_version.txt b/Protocols/SIP/Docs/sip_version.txt index 591f6e1..d837ea7 100644 --- a/Protocols/SIP/Docs/sip_version.txt +++ b/Protocols/SIP/Docs/sip_version.txt @@ -1 +1 @@ -SIP protocol 0.1.0.0 \ No newline at end of file +SIP protocol 0.1.1.0 \ No newline at end of file diff --git a/Protocols/SIP/SIPProto.cpp b/Protocols/SIP/SIPProto.cpp index 16ac82a..7d5e84d 100644 --- a/Protocols/SIP/SIPProto.cpp +++ b/Protocols/SIP/SIPProto.cpp @@ -1509,7 +1509,8 @@ int __cdecl SIPProto::VoiceCall(WPARAM wParam, LPARAM lParam) } pjsua_call_id call_id; - pj_status_t status = pjsua_call_make_call(acc_id, &pj_str(TcharToSip(uri)), 0, NULL, NULL, &call_id); + pj_str_t ret; + pj_status_t status = pjsua_call_make_call(acc_id, pj_cstr(&ret, TcharToSip(uri)), 0, NULL, NULL, &call_id); if (status != PJ_SUCCESS) { Error(status, _T("Error making call")); @@ -1645,7 +1646,8 @@ int __cdecl SIPProto::VoiceSendDTMF(WPARAM wParam, LPARAM lParam) TCHAR tmp[2]; tmp[0] = c; tmp[1] = 0; - pjsua_call_dial_dtmf(call_id, &pj_str(TcharToSip(tmp))); + pj_str_t ret; + pjsua_call_dial_dtmf(call_id, pj_cstr(&ret, TcharToSip(tmp))); return 0; } @@ -1706,7 +1708,8 @@ void __cdecl SIPProto::SearchUserThread(void *param) return; } - if (pjsua_buddy_find(&pj_str(sip_uri)) != PJSUA_INVALID_ID) + pj_str_t ret; + if (pjsua_buddy_find(pj_cstr(&ret, sip_uri)) != PJSUA_INVALID_ID) { Info(_T("Contact already in your contact list")); SendBroadcast(NULL, ACKTYPE_SEARCH, ACKRESULT_SUCCESS, param, 0); @@ -1972,7 +1975,8 @@ int __cdecl SIPProto::SendMsg(HANDLE hContact, int flags, const char *msg) md->messageID = InterlockedIncrement(&messageID); md->hContact = hContact; - status = pjsua_im_send(acc_id, &info.uri, NULL, &pj_str(text), NULL, md); + pj_str_t ret; + status = pjsua_im_send(acc_id, &info.uri, NULL, pj_cstr(&ret, text), NULL, md); if (status != PJ_SUCCESS) { Error(status, _T("Error sending message")); @@ -2004,7 +2008,8 @@ void SIPProto::on_pager_status(HANDLE hContact, LONG messageID, pjsip_status_cod void SIPProto::on_typing(char *from, bool isTyping) { - pjsua_buddy_id buddy_id = pjsua_buddy_find(&pj_str(from)); + pj_str_t ret; + pjsua_buddy_id buddy_id = pjsua_buddy_find(pj_cstr(&ret, from)); if (buddy_id == PJSUA_INVALID_ID) return; @@ -2243,8 +2248,9 @@ int __cdecl SIPProto::AuthDeny(HANDLE hDbEvent, const char *szReason) DBWriteContactSettingByte(hContact, m_szModuleName, "AuthState", AUTH_STATE_DENIED); + pj_str_t ret; pjsua_pres_notify(acc_id, srv_pres, PJSIP_EVSUB_STATE_TERMINATED, NULL, - &pj_str(TcharToSip(CharToTchar(szReason))), false, NULL); + pj_cstr(&ret, TcharToSip(CharToTchar(szReason))), false, NULL); return 0; } @@ -2274,7 +2280,8 @@ HANDLE SIPProto::GetContact(pjsua_buddy_id buddy_id) HANDLE SIPProto::GetContact(const TCHAR *uri, bool addIfNeeded, bool temporary) { - pjsua_buddy_id buddy_id = pjsua_buddy_find(&pj_str(TcharToSip(uri))); + pj_str_t ret; + pjsua_buddy_id buddy_id = pjsua_buddy_find(pj_cstr(&ret, TcharToSip(uri))); if (buddy_id != PJSUA_INVALID_ID) return GetContact(buddy_id); diff --git a/Protocols/SIP/build/rakefile b/Protocols/SIP/build/rakefile index 8028b57..c2a8061 100644 --- a/Protocols/SIP/build/rakefile +++ b/Protocols/SIP/build/rakefile @@ -48,7 +48,8 @@ end # Build ############################################################################## -SOLUTION="#{PROJECT}.sln" +#SOLUTION="#{PROJECT}.sln" +SOLUTION="#{PROJECT}.dsw" CONFIG=[ "Release", "Unicode Release" ] BUILD_RESULT_DIR=[ "../Release", "../Unicode_Release" ] DLL=[ "../../../bin/Release/Plugins/#{PROJECT}.dll", "../../../bin/Release Unicode/Plugins/#{PROJECT}W.dll" ] @@ -64,7 +65,8 @@ PDB=[ "#{BUILD_RESULT_DIR[0]}/#{PROJECT}.pdb", "#{BUILD_RESULT_DIR[1]}/#{PROJECT puts puts "Building #{type} #{PROJECT}" chdir(SRC_DIR) do - sh "#{VC} #{SOLUTION} /Build \"#{CONFIG[i]}\"" do |ok, status| +# sh "#{VC} #{SOLUTION} /Build \"#{CONFIG[i]}\"" do |ok, status| + sh "msdev #{SOLUTION} /MAKE \"#{PROJECT} - Win32 #{CONFIG[i]}\" /REBUILD" do |ok, status| ok or fail "Failed to compile #{type} dll (#{status.exitstatus})" end end @@ -130,6 +132,7 @@ ZIP_FOLDERS=['zip_ansi', 'zip_unicode'] ZIPS=[ "#{PROJECT}", "#{PROJECT}W" ] VOICE_SERVICE=[ "../../../bin/Release/Plugins/voiceservice.dll", "../../../bin/Release/Plugins/voiceserviceW.dll" ] +HISTORY_EVENTS=[ "../../../bin/Release/Plugins/aa_historyevents.dll", "../../../bin/Release Unicode/Plugins/aa_historyeventsW.dll" ] (0..1).each do |i| type = TYPES[i] @@ -163,6 +166,7 @@ VOICE_SERVICE=[ "../../../bin/Release/Plugins/voiceservice.dll", "../../../bin/R makedirs target_dir cp DLL[i], target_dir cp VOICE_SERVICE[i], target_dir + cp HISTORY_EVENTS[i], target_dir rm zip, :force => true chdir(ZIP_FOLDERS[i]) do diff --git a/Protocols/SIP/commons.h b/Protocols/SIP/commons.h index 4112a0b..47b4cfd 100644 --- a/Protocols/SIP/commons.h +++ b/Protocols/SIP/commons.h @@ -28,6 +28,7 @@ Boston, MA 02111-1307, USA. #include #include #include +#include #include #include diff --git a/Protocols/SIP/lib/openssl/lib/libeay32MDd.lib b/Protocols/SIP/lib/openssl/lib/libeay32MDd.lib new file mode 100644 index 0000000..082c724 Binary files /dev/null and b/Protocols/SIP/lib/openssl/lib/libeay32MDd.lib differ diff --git a/Protocols/SIP/lib/openssl/lib/libeay32MT.lib b/Protocols/SIP/lib/openssl/lib/libeay32MT.lib new file mode 100644 index 0000000..c8bc3ee Binary files /dev/null and b/Protocols/SIP/lib/openssl/lib/libeay32MT.lib differ diff --git a/Protocols/SIP/lib/openssl/lib/ssleay32MDd.lib b/Protocols/SIP/lib/openssl/lib/ssleay32MDd.lib new file mode 100644 index 0000000..d901698 Binary files /dev/null and b/Protocols/SIP/lib/openssl/lib/ssleay32MDd.lib differ diff --git a/Protocols/SIP/lib/openssl/lib/ssleay32MT.lib b/Protocols/SIP/lib/openssl/lib/ssleay32MT.lib new file mode 100644 index 0000000..b3d7678 Binary files /dev/null and b/Protocols/SIP/lib/openssl/lib/ssleay32MT.lib differ diff --git a/Protocols/SIP/lib/pjsip/lib/vc6/libg7221codec-i386-win32-vc6-debug.lib b/Protocols/SIP/lib/pjsip/lib/vc6/libg7221codec-i386-win32-vc6-debug.lib new file mode 100644 index 0000000..a3d1b24 Binary files /dev/null and b/Protocols/SIP/lib/pjsip/lib/vc6/libg7221codec-i386-win32-vc6-debug.lib differ diff --git a/Protocols/SIP/lib/pjsip/lib/vc6/libg7221codec-i386-win32-vc6-release.lib b/Protocols/SIP/lib/pjsip/lib/vc6/libg7221codec-i386-win32-vc6-release.lib new file mode 100644 index 0000000..e53fb49 Binary files /dev/null and b/Protocols/SIP/lib/pjsip/lib/vc6/libg7221codec-i386-win32-vc6-release.lib differ diff --git a/Protocols/SIP/lib/pjsip/lib/vc6/libgsmcodec-i386-win32-vc6-debug.lib b/Protocols/SIP/lib/pjsip/lib/vc6/libgsmcodec-i386-win32-vc6-debug.lib new file mode 100644 index 0000000..849b344 Binary files /dev/null and b/Protocols/SIP/lib/pjsip/lib/vc6/libgsmcodec-i386-win32-vc6-debug.lib differ diff --git a/Protocols/SIP/lib/pjsip/lib/vc6/libgsmcodec-i386-win32-vc6-release.lib b/Protocols/SIP/lib/pjsip/lib/vc6/libgsmcodec-i386-win32-vc6-release.lib new file mode 100644 index 0000000..ff6dc4a Binary files /dev/null and b/Protocols/SIP/lib/pjsip/lib/vc6/libgsmcodec-i386-win32-vc6-release.lib differ diff --git a/Protocols/SIP/lib/pjsip/lib/vc6/libilbccodec-i386-win32-vc6-debug.lib b/Protocols/SIP/lib/pjsip/lib/vc6/libilbccodec-i386-win32-vc6-debug.lib new file mode 100644 index 0000000..b437ddb Binary files /dev/null and b/Protocols/SIP/lib/pjsip/lib/vc6/libilbccodec-i386-win32-vc6-debug.lib differ diff --git a/Protocols/SIP/lib/pjsip/lib/vc6/libilbccodec-i386-win32-vc6-release.lib b/Protocols/SIP/lib/pjsip/lib/vc6/libilbccodec-i386-win32-vc6-release.lib new file mode 100644 index 0000000..79d5581 Binary files /dev/null and b/Protocols/SIP/lib/pjsip/lib/vc6/libilbccodec-i386-win32-vc6-release.lib differ diff --git a/Protocols/SIP/lib/pjsip/lib/vc6/libmilenage-i386-win32-vc6-debug.lib b/Protocols/SIP/lib/pjsip/lib/vc6/libmilenage-i386-win32-vc6-debug.lib new file mode 100644 index 0000000..0a6c140 Binary files /dev/null and b/Protocols/SIP/lib/pjsip/lib/vc6/libmilenage-i386-win32-vc6-debug.lib differ diff --git a/Protocols/SIP/lib/pjsip/lib/vc6/libmilenage-i386-win32-vc6-release.lib b/Protocols/SIP/lib/pjsip/lib/vc6/libmilenage-i386-win32-vc6-release.lib new file mode 100644 index 0000000..d6297a8 Binary files /dev/null and b/Protocols/SIP/lib/pjsip/lib/vc6/libmilenage-i386-win32-vc6-release.lib differ diff --git a/Protocols/SIP/lib/pjsip/lib/vc6/libportaudio-i386-win32-vc6-debug.lib b/Protocols/SIP/lib/pjsip/lib/vc6/libportaudio-i386-win32-vc6-debug.lib new file mode 100644 index 0000000..9dfddf1 Binary files /dev/null and b/Protocols/SIP/lib/pjsip/lib/vc6/libportaudio-i386-win32-vc6-debug.lib differ diff --git a/Protocols/SIP/lib/pjsip/lib/vc6/libportaudio-i386-win32-vc6-release.lib b/Protocols/SIP/lib/pjsip/lib/vc6/libportaudio-i386-win32-vc6-release.lib new file mode 100644 index 0000000..00d22ad Binary files /dev/null and b/Protocols/SIP/lib/pjsip/lib/vc6/libportaudio-i386-win32-vc6-release.lib differ diff --git a/Protocols/SIP/lib/pjsip/lib/vc6/libresample-i386-win32-vc6-debug.lib b/Protocols/SIP/lib/pjsip/lib/vc6/libresample-i386-win32-vc6-debug.lib new file mode 100644 index 0000000..50befba Binary files /dev/null and b/Protocols/SIP/lib/pjsip/lib/vc6/libresample-i386-win32-vc6-debug.lib differ diff --git a/Protocols/SIP/lib/pjsip/lib/vc6/libresample-i386-win32-vc6-release.lib b/Protocols/SIP/lib/pjsip/lib/vc6/libresample-i386-win32-vc6-release.lib new file mode 100644 index 0000000..f21a22b Binary files /dev/null and b/Protocols/SIP/lib/pjsip/lib/vc6/libresample-i386-win32-vc6-release.lib differ diff --git a/Protocols/SIP/lib/pjsip/lib/vc6/libspeex-i386-win32-vc6-debug.lib b/Protocols/SIP/lib/pjsip/lib/vc6/libspeex-i386-win32-vc6-debug.lib new file mode 100644 index 0000000..f59c781 Binary files /dev/null and b/Protocols/SIP/lib/pjsip/lib/vc6/libspeex-i386-win32-vc6-debug.lib differ diff --git a/Protocols/SIP/lib/pjsip/lib/vc6/libspeex-i386-win32-vc6-release.lib b/Protocols/SIP/lib/pjsip/lib/vc6/libspeex-i386-win32-vc6-release.lib new file mode 100644 index 0000000..f989c0e Binary files /dev/null and b/Protocols/SIP/lib/pjsip/lib/vc6/libspeex-i386-win32-vc6-release.lib differ diff --git a/Protocols/SIP/lib/pjsip/lib/vc6/libsrtp-i386-win32-vc6-debug.lib b/Protocols/SIP/lib/pjsip/lib/vc6/libsrtp-i386-win32-vc6-debug.lib new file mode 100644 index 0000000..b339f48 Binary files /dev/null and b/Protocols/SIP/lib/pjsip/lib/vc6/libsrtp-i386-win32-vc6-debug.lib differ diff --git a/Protocols/SIP/lib/pjsip/lib/vc6/libsrtp-i386-win32-vc6-release.lib b/Protocols/SIP/lib/pjsip/lib/vc6/libsrtp-i386-win32-vc6-release.lib new file mode 100644 index 0000000..ffcad37 Binary files /dev/null and b/Protocols/SIP/lib/pjsip/lib/vc6/libsrtp-i386-win32-vc6-release.lib differ diff --git a/Protocols/SIP/lib/pjsip/lib/vc6/pjlib-i386-win32-vc6-debug.lib b/Protocols/SIP/lib/pjsip/lib/vc6/pjlib-i386-win32-vc6-debug.lib new file mode 100644 index 0000000..ebae5ca Binary files /dev/null and b/Protocols/SIP/lib/pjsip/lib/vc6/pjlib-i386-win32-vc6-debug.lib differ diff --git a/Protocols/SIP/lib/pjsip/lib/vc6/pjlib-i386-win32-vc6-release.lib b/Protocols/SIP/lib/pjsip/lib/vc6/pjlib-i386-win32-vc6-release.lib new file mode 100644 index 0000000..2b2eb70 Binary files /dev/null and b/Protocols/SIP/lib/pjsip/lib/vc6/pjlib-i386-win32-vc6-release.lib differ diff --git a/Protocols/SIP/lib/pjsip/lib/vc6/pjlib-util-i386-win32-vc6-debug.lib b/Protocols/SIP/lib/pjsip/lib/vc6/pjlib-util-i386-win32-vc6-debug.lib new file mode 100644 index 0000000..ced470e Binary files /dev/null and b/Protocols/SIP/lib/pjsip/lib/vc6/pjlib-util-i386-win32-vc6-debug.lib differ diff --git a/Protocols/SIP/lib/pjsip/lib/vc6/pjlib-util-i386-win32-vc6-release.lib b/Protocols/SIP/lib/pjsip/lib/vc6/pjlib-util-i386-win32-vc6-release.lib new file mode 100644 index 0000000..baec769 Binary files /dev/null and b/Protocols/SIP/lib/pjsip/lib/vc6/pjlib-util-i386-win32-vc6-release.lib differ diff --git a/Protocols/SIP/lib/pjsip/lib/vc6/pjmedia-audiodev-i386-win32-vc6-debug.lib b/Protocols/SIP/lib/pjsip/lib/vc6/pjmedia-audiodev-i386-win32-vc6-debug.lib new file mode 100644 index 0000000..3aad1d8 Binary files /dev/null and b/Protocols/SIP/lib/pjsip/lib/vc6/pjmedia-audiodev-i386-win32-vc6-debug.lib differ diff --git a/Protocols/SIP/lib/pjsip/lib/vc6/pjmedia-audiodev-i386-win32-vc6-release.lib b/Protocols/SIP/lib/pjsip/lib/vc6/pjmedia-audiodev-i386-win32-vc6-release.lib new file mode 100644 index 0000000..ebf8dab Binary files /dev/null and b/Protocols/SIP/lib/pjsip/lib/vc6/pjmedia-audiodev-i386-win32-vc6-release.lib differ diff --git a/Protocols/SIP/lib/pjsip/lib/vc6/pjmedia-codec-i386-win32-vc6-debug.lib b/Protocols/SIP/lib/pjsip/lib/vc6/pjmedia-codec-i386-win32-vc6-debug.lib new file mode 100644 index 0000000..f4a461d Binary files /dev/null and b/Protocols/SIP/lib/pjsip/lib/vc6/pjmedia-codec-i386-win32-vc6-debug.lib differ diff --git a/Protocols/SIP/lib/pjsip/lib/vc6/pjmedia-codec-i386-win32-vc6-release.lib b/Protocols/SIP/lib/pjsip/lib/vc6/pjmedia-codec-i386-win32-vc6-release.lib new file mode 100644 index 0000000..243bb7e Binary files /dev/null and b/Protocols/SIP/lib/pjsip/lib/vc6/pjmedia-codec-i386-win32-vc6-release.lib differ diff --git a/Protocols/SIP/lib/pjsip/lib/vc6/pjmedia-i386-win32-vc6-debug.lib b/Protocols/SIP/lib/pjsip/lib/vc6/pjmedia-i386-win32-vc6-debug.lib new file mode 100644 index 0000000..66b7e40 Binary files /dev/null and b/Protocols/SIP/lib/pjsip/lib/vc6/pjmedia-i386-win32-vc6-debug.lib differ diff --git a/Protocols/SIP/lib/pjsip/lib/vc6/pjmedia-i386-win32-vc6-release.lib b/Protocols/SIP/lib/pjsip/lib/vc6/pjmedia-i386-win32-vc6-release.lib new file mode 100644 index 0000000..ebcd4b5 Binary files /dev/null and b/Protocols/SIP/lib/pjsip/lib/vc6/pjmedia-i386-win32-vc6-release.lib differ diff --git a/Protocols/SIP/lib/pjsip/lib/vc6/pjnath-i386-win32-vc6-debug.lib b/Protocols/SIP/lib/pjsip/lib/vc6/pjnath-i386-win32-vc6-debug.lib new file mode 100644 index 0000000..f915e7d Binary files /dev/null and b/Protocols/SIP/lib/pjsip/lib/vc6/pjnath-i386-win32-vc6-debug.lib differ diff --git a/Protocols/SIP/lib/pjsip/lib/vc6/pjnath-i386-win32-vc6-release.lib b/Protocols/SIP/lib/pjsip/lib/vc6/pjnath-i386-win32-vc6-release.lib new file mode 100644 index 0000000..515dd9f Binary files /dev/null and b/Protocols/SIP/lib/pjsip/lib/vc6/pjnath-i386-win32-vc6-release.lib differ diff --git a/Protocols/SIP/lib/pjsip/lib/vc6/pjsip-core-i386-win32-vc6-debug.lib b/Protocols/SIP/lib/pjsip/lib/vc6/pjsip-core-i386-win32-vc6-debug.lib new file mode 100644 index 0000000..b491f2f Binary files /dev/null and b/Protocols/SIP/lib/pjsip/lib/vc6/pjsip-core-i386-win32-vc6-debug.lib differ diff --git a/Protocols/SIP/lib/pjsip/lib/vc6/pjsip-core-i386-win32-vc6-release.lib b/Protocols/SIP/lib/pjsip/lib/vc6/pjsip-core-i386-win32-vc6-release.lib new file mode 100644 index 0000000..cb12ab4 Binary files /dev/null and b/Protocols/SIP/lib/pjsip/lib/vc6/pjsip-core-i386-win32-vc6-release.lib differ diff --git a/Protocols/SIP/lib/pjsip/lib/vc6/pjsip-simple-i386-win32-vc6-debug.lib b/Protocols/SIP/lib/pjsip/lib/vc6/pjsip-simple-i386-win32-vc6-debug.lib new file mode 100644 index 0000000..f99cc7b Binary files /dev/null and b/Protocols/SIP/lib/pjsip/lib/vc6/pjsip-simple-i386-win32-vc6-debug.lib differ diff --git a/Protocols/SIP/lib/pjsip/lib/vc6/pjsip-simple-i386-win32-vc6-release.lib b/Protocols/SIP/lib/pjsip/lib/vc6/pjsip-simple-i386-win32-vc6-release.lib new file mode 100644 index 0000000..7ba54e3 Binary files /dev/null and b/Protocols/SIP/lib/pjsip/lib/vc6/pjsip-simple-i386-win32-vc6-release.lib differ diff --git a/Protocols/SIP/lib/pjsip/lib/vc6/pjsip-ua-i386-win32-vc6-debug.lib b/Protocols/SIP/lib/pjsip/lib/vc6/pjsip-ua-i386-win32-vc6-debug.lib new file mode 100644 index 0000000..87caa58 Binary files /dev/null and b/Protocols/SIP/lib/pjsip/lib/vc6/pjsip-ua-i386-win32-vc6-debug.lib differ diff --git a/Protocols/SIP/lib/pjsip/lib/vc6/pjsip-ua-i386-win32-vc6-release.lib b/Protocols/SIP/lib/pjsip/lib/vc6/pjsip-ua-i386-win32-vc6-release.lib new file mode 100644 index 0000000..de02277 Binary files /dev/null and b/Protocols/SIP/lib/pjsip/lib/vc6/pjsip-ua-i386-win32-vc6-release.lib differ diff --git a/Protocols/SIP/lib/pjsip/lib/vc6/pjsua-lib-i386-win32-vc6-debug.lib b/Protocols/SIP/lib/pjsip/lib/vc6/pjsua-lib-i386-win32-vc6-debug.lib new file mode 100644 index 0000000..40fe3d0 Binary files /dev/null and b/Protocols/SIP/lib/pjsip/lib/vc6/pjsua-lib-i386-win32-vc6-debug.lib differ diff --git a/Protocols/SIP/lib/pjsip/lib/vc6/pjsua-lib-i386-win32-vc6-release.lib b/Protocols/SIP/lib/pjsip/lib/vc6/pjsua-lib-i386-win32-vc6-release.lib new file mode 100644 index 0000000..5dbd456 Binary files /dev/null and b/Protocols/SIP/lib/pjsip/lib/vc6/pjsua-lib-i386-win32-vc6-release.lib differ diff --git a/Protocols/SIP/lib/pjsip/pjlib/include/pj/config_site.h b/Protocols/SIP/lib/pjsip/pjlib/include/pj/config_site.h index e69de29..7eb6722 100644 --- a/Protocols/SIP/lib/pjsip/pjlib/include/pj/config_site.h +++ b/Protocols/SIP/lib/pjsip/pjlib/include/pj/config_site.h @@ -0,0 +1,10 @@ +// Uncomment to get minimum footprint (suitable for 1-2 concurrent calls only) +//#define PJ_CONFIG_MINIMAL_SIZE + +// Uncomment to get maximum performance +//#define PJ_CONFIG_MAXIMUM_SPEED + +#define PJSIP_HAS_TLS_TRANSPORT 1 +#define PJ_HAS_SSL_SOCK 1 + +#include \ No newline at end of file diff --git a/Protocols/SIP/lib/pjsip/pjlib/include/pj/timer.h b/Protocols/SIP/lib/pjsip/pjlib/include/pj/timer.h index 8e0dd45..a432d6e 100644 --- a/Protocols/SIP/lib/pjsip/pjlib/include/pj/timer.h +++ b/Protocols/SIP/lib/pjsip/pjlib/include/pj/timer.h @@ -1,4 +1,4 @@ -/* $Id: timer.h 2512 2009-03-13 15:49:06Z bennylp $ */ +/* $Id: timer.h 3034 2009-12-16 13:30:34Z bennylp $ */ /* * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -64,11 +64,7 @@ PJ_BEGIN_DECL /** * The type for internal timer ID. */ -#if defined(PJ_SYMBIAN) && PJ_SYMBIAN!=0 -typedef void *pj_timer_id_t; -#else typedef int pj_timer_id_t; -#endif /** * Forward declaration for pj_timer_entry. diff --git a/Protocols/SIP/lib/pjsip/pjnath/include/pjnath/ice_strans.h b/Protocols/SIP/lib/pjsip/pjnath/include/pjnath/ice_strans.h index 6788796..e1cc6ec 100644 --- a/Protocols/SIP/lib/pjsip/pjnath/include/pjnath/ice_strans.h +++ b/Protocols/SIP/lib/pjsip/pjnath/include/pjnath/ice_strans.h @@ -1,4 +1,4 @@ -/* $Id: ice_strans.h 2966 2009-10-25 09:02:07Z bennylp $ */ +/* $Id: ice_strans.h 3028 2009-12-08 13:11:25Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono @@ -621,6 +621,17 @@ PJ_DECL(pj_status_t) pj_ice_strans_get_ufrag_pwd(pj_ice_strans *ice_st, pj_str_t *rem_pwd); +/** + * Get the number of local candidates for the specified component ID. + * + * @param ice_st The ICE stream transport. + * @param comp_id Component ID. + * + * @return The number of candidates. + */ +PJ_DECL(unsigned) pj_ice_strans_get_cands_count(pj_ice_strans *ice_st, + unsigned comp_id); + /** * Enumerate the local candidates for the specified component. * diff --git a/Protocols/SIP/lib/pjsip/pjnath/include/pjnath/turn_session.h b/Protocols/SIP/lib/pjsip/pjnath/include/pjnath/turn_session.h index a23aac2..21b45c2 100644 --- a/Protocols/SIP/lib/pjsip/pjnath/include/pjnath/turn_session.h +++ b/Protocols/SIP/lib/pjsip/pjnath/include/pjnath/turn_session.h @@ -1,4 +1,4 @@ -/* $Id: turn_session.h 2642 2009-04-22 17:20:24Z bennylp $ */ +/* $Id: turn_session.h 3028 2009-12-08 13:11:25Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono @@ -455,11 +455,19 @@ PJ_DECL(pj_status_t) pj_turn_session_shutdown(pj_turn_session *sess); * be notified about the client destruction. * * @param sess The TURN client session. + * @param last_err Optional error code to be set to the session, + * which would be returned back in the \a info + * parameter of #pj_turn_session_get_info(). If + * this argument value is PJ_SUCCESS, the error + * code will not be set. If the session already + * has an error code set, this function will not + * overwrite that error code either. * * @return PJ_SUCCESS if the operation has been successful, * or the appropriate error code on failure. */ -PJ_DECL(pj_status_t) pj_turn_session_destroy(pj_turn_session *sess); +PJ_DECL(pj_status_t) pj_turn_session_destroy(pj_turn_session *sess, + pj_status_t last_err); /** diff --git a/Protocols/SIP/sip.cpp b/Protocols/SIP/sip.cpp index 0a03fd7..cb3dc36 100644 --- a/Protocols/SIP/sip.cpp +++ b/Protocols/SIP/sip.cpp @@ -30,7 +30,7 @@ PLUGININFOEX pluginInfo={ #else "SIP protocol (Ansi)", #endif - PLUGIN_MAKE_VERSION(0,1,0,0), + PLUGIN_MAKE_VERSION(0,1,1,0), "Provides support for SIP protocol", "Ricardo Pescuma Domenecci", "pescuma@miranda-im.org", diff --git a/Protocols/SIP/sip.dsp b/Protocols/SIP/sip.dsp index b4cce31..b519e1a 100644 --- a/Protocols/SIP/sip.dsp +++ b/Protocols/SIP/sip.dsp @@ -46,7 +46,7 @@ RSC=rc.exe # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /GX /O1 /YX /FD /c # SUBTRACT BASE CPP /Fr -# ADD CPP /nologo /G4 /MT /W3 /GX /O2 /Ob0 /I "../../include" /I "sdk" /I "lib/sipclient" /D "WIN32" /D "W32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /Fr /YX /FD /c +# ADD CPP /nologo /G4 /MT /W3 /GX /O2 /Ob0 /I "../../include" /I "sdk" /I "lib/pjsip/pjlib/include" /I "lib/pjsip/pjlib-util/include" /I "lib\pjsip\pjmedia\include" /I "lib\pjsip\pjnath\include" /I "lib\pjsip\pjsip\include" /D "WIN32" /D "W32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /Fr /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x417 /d "NDEBUG" @@ -57,7 +57,7 @@ BSC32=bscmake.exe LINK32=link.exe # ADD BASE LINK32 user32.lib shell32.lib wininet.lib gdi32.lib /nologo /base:"0x67100000" /dll /machine:I386 /filealign:0x200 # SUBTRACT BASE LINK32 /pdb:none /map -# ADD LINK32 libgsm.lib libsip2.lib libsipclient.lib libogg.lib libportaudio.lib libportmixer.lib libspeex.lib ws2_32.lib kernel32.lib user32.lib /nologo /base:"0x3EC20000" /dll /map /debug /debugtype:both /machine:I386 /out:"..\..\bin\release\Plugins\sip.dll" /pdbtype:sept /libpath:"lib/sipclient/Release" /filealign:0x200 /ALIGN:4096 /ignore:4108 +# ADD LINK32 libresample-i386-win32-vc6-release.lib libspeex-i386-win32-vc6-release.lib libsrtp-i386-win32-vc6-release.lib pjlib-i386-win32-vc6-release.lib pjlib-util-i386-win32-vc6-release.lib pjmedia-audiodev-i386-win32-vc6-release.lib pjmedia-codec-i386-win32-vc6-release.lib pjmedia-i386-win32-vc6-release.lib pjnath-i386-win32-vc6-release.lib pjsip-core-i386-win32-vc6-release.lib pjsip-simple-i386-win32-vc6-release.lib pjsip-ua-i386-win32-vc6-release.lib pjsua-lib-i386-win32-vc6-release.lib libg7221codec-i386-win32-vc6-release.lib libgsmcodec-i386-win32-vc6-release.lib libilbccodec-i386-win32-vc6-release.lib libmilenage-i386-win32-vc6-release.lib libportaudio-i386-win32-vc6-release.lib ws2_32.lib kernel32.lib user32.lib Ole32.lib Advapi32.lib Gdi32.lib Mswsock.lib /nologo /base:"0x3EC20000" /dll /map /debug /debugtype:both /machine:I386 /out:"..\..\bin\release\Plugins\sip.dll" /pdbtype:sept /libpath:"lib\pjsip\lib\vc6" /libpath:"lib\openssl\lib" /filealign:0x200 /ALIGN:4096 /ignore:4108 # SUBTRACT LINK32 /profile /pdb:none !ELSEIF "$(CFG)" == "sip - Win32 Debug" @@ -75,7 +75,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /G4 /MT /W3 /GX /O2 /Ob0 /I "../../include" /FR /YX /FD /c -# ADD CPP /nologo /G4 /MDd /W3 /GX /ZI /Od /I "../../include" /I "sdk" /I "lib/sipclient" /D "WIN32" /D "W32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FR /YX /FD /c +# ADD CPP /nologo /G4 /MDd /W3 /GX /ZI /Od /I "../../include" /I "sdk" /I "lib/pjsip/pjlib/include" /I "lib/pjsip/pjlib-util/include" /I "lib\pjsip\pjmedia\include" /I "lib\pjsip\pjnath\include" /I "lib\pjsip\pjsip\include" /D "WIN32" /D "W32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FR /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x417 /d "NDEBUG" @@ -86,7 +86,7 @@ BSC32=bscmake.exe LINK32=link.exe # ADD BASE LINK32 comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..bin\release\Plugins\sip.dll" /filealign:0x200 /ALIGN:4096 /ignore:4108 # SUBTRACT BASE LINK32 /profile /pdb:none -# ADD LINK32 libgsm.lib libsip2.lib libsipclient.lib libogg.lib libportaudio.lib libportmixer.lib libspeex.lib ws2_32.lib kernel32.lib user32.lib /nologo /base:"0x3EC20000" /dll /incremental:yes /debug /machine:I386 /out:"..\..\bin\debug\Plugins\sip.dll" /libpath:"lib/sipclient/Debug" /filealign:0x200 /ALIGN:4096 /ignore:4108 +# ADD LINK32 libspeex-i386-win32-vc6-debug.lib libsrtp-i386-win32-vc6-debug.lib pjlib-i386-win32-vc6-debug.lib pjlib-util-i386-win32-vc6-debug.lib pjmedia-audiodev-i386-win32-vc6-debug.lib pjmedia-codec-i386-win32-vc6-debug.lib pjmedia-i386-win32-vc6-debug.lib pjnath-i386-win32-vc6-debug.lib pjsip-core-i386-win32-vc6-debug.lib pjsip-simple-i386-win32-vc6-debug.lib pjsip-ua-i386-win32-vc6-debug.lib pjsua-lib-i386-win32-vc6-debug.lib libg7221codec-i386-win32-vc6-debug.lib libgsmcodec-i386-win32-vc6-debug.lib libilbccodec-i386-win32-vc6-debug.lib libmilenage-i386-win32-vc6-debug.lib libportaudio-i386-win32-vc6-debug.lib libresample-i386-win32-vc6-debug.lib ws2_32.lib kernel32.lib user32.lib Ole32.lib Advapi32.lib Gdi32.lib Mswsock.lib /nologo /base:"0x3EC20000" /dll /incremental:yes /debug /machine:I386 /out:"..\..\bin\debug\Plugins\sip.dll" /libpath:"lib\pjsip\lib\vc6" /libpath:"lib\openssl\lib" /filealign:0x200 /ALIGN:4096 /ignore:4108 # SUBTRACT LINK32 /profile /pdb:none !ELSEIF "$(CFG)" == "sip - Win32 Unicode Debug" @@ -104,7 +104,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /G4 /MTd /W3 /GX /ZI /Od /I "../../include" /FR /YX /FD /c -# ADD CPP /nologo /G4 /MDd /W3 /GX /ZI /Od /I "lib/sipclient" /I "../../include" /I "sdk" /D "WIN32" /D "W32" /D "_DEBUG" /D "_WINDOWS" /D "_UNICODE" /D "UNICODE" /D "_USRDLL" /FR /YX /FD /c +# ADD CPP /nologo /G4 /MDd /W3 /GX /ZI /Od /I "../../include" /I "sdk" /I "lib/pjsip/pjlib/include" /I "lib/pjsip/pjlib-util/include" /I "lib\pjsip\pjmedia\include" /I "lib\pjsip\pjnath\include" /I "lib\pjsip\pjsip\include" /D "WIN32" /D "W32" /D "_DEBUG" /D "_WINDOWS" /D "_UNICODE" /D "UNICODE" /D "_USRDLL" /FR /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x417 /d "NDEBUG" @@ -115,7 +115,7 @@ BSC32=bscmake.exe LINK32=link.exe # ADD BASE LINK32 comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x32100000" /dll /incremental:yes /debug /machine:I386 /out:"..\..\bin\debug\Plugins\sip.dll" /filealign:0x200 /ALIGN:4096 /ignore:4108 # SUBTRACT BASE LINK32 /profile /pdb:none -# ADD LINK32 libgsm.lib libsip2.lib libsipclient.lib libogg.lib libportaudio.lib libportmixer.lib libspeex.lib ws2_32.lib kernel32.lib user32.lib /nologo /base:"0x3EC20000" /dll /incremental:yes /debug /machine:I386 /out:"..\..\bin\debug unicode\Plugins\sipW.dll" /libpath:"lib/sipclient/Debug" /filealign:0x200 /ALIGN:4096 /ignore:4108 +# ADD LINK32 libspeex-i386-win32-vc6-debug.lib libsrtp-i386-win32-vc6-debug.lib pjlib-i386-win32-vc6-debug.lib pjlib-util-i386-win32-vc6-debug.lib pjmedia-audiodev-i386-win32-vc6-debug.lib pjmedia-codec-i386-win32-vc6-debug.lib pjmedia-i386-win32-vc6-debug.lib pjnath-i386-win32-vc6-debug.lib pjsip-core-i386-win32-vc6-debug.lib pjsip-simple-i386-win32-vc6-debug.lib pjsip-ua-i386-win32-vc6-debug.lib pjsua-lib-i386-win32-vc6-debug.lib libg7221codec-i386-win32-vc6-debug.lib libgsmcodec-i386-win32-vc6-debug.lib libilbccodec-i386-win32-vc6-debug.lib libmilenage-i386-win32-vc6-debug.lib libportaudio-i386-win32-vc6-debug.lib libresample-i386-win32-vc6-debug.lib ws2_32.lib kernel32.lib user32.lib Ole32.lib Advapi32.lib Gdi32.lib Mswsock.lib /nologo /base:"0x3EC20000" /dll /incremental:yes /debug /machine:I386 /out:"..\..\bin\debug unicode\Plugins\sipW.dll" /libpath:"lib\pjsip\lib\vc6" /libpath:"lib\openssl\lib" /filealign:0x200 /ALIGN:4096 /ignore:4108 # SUBTRACT LINK32 /profile /pdb:none !ELSEIF "$(CFG)" == "sip - Win32 Unicode Release" @@ -133,7 +133,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /G4 /MT /W3 /GX /O2 /Ob0 /I "../../include" /Fr /YX /FD /c -# ADD CPP /nologo /G4 /MT /W3 /GX /O2 /Ob0 /I "../../include" /I "sdk" /I "lib/sipclient" /D "WIN32" /D "W32" /D "NDEBUG" /D "_WINDOWS" /D "_UNICODE" /D "UNICODE" /D "_USRDLL" /Fr /YX /FD /c +# ADD CPP /nologo /G4 /MT /W3 /GX /O2 /Ob0 /I "../../include" /I "sdk" /I "lib/pjsip/pjlib/include" /I "lib/pjsip/pjlib-util/include" /I "lib\pjsip\pjmedia\include" /I "lib\pjsip\pjnath\include" /I "lib\pjsip\pjsip\include" /D "WIN32" /D "W32" /D "NDEBUG" /D "_WINDOWS" /D "_UNICODE" /D "UNICODE" /D "_USRDLL" /Fr /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x417 /d "NDEBUG" @@ -144,7 +144,7 @@ BSC32=bscmake.exe LINK32=link.exe # ADD BASE LINK32 comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x32100000" /dll /map /machine:I386 /out:"..\..\bin\release\Plugins\sip.dll" /filealign:0x200 /ALIGN:4096 /ignore:4108 # SUBTRACT BASE LINK32 /profile /pdb:none -# ADD LINK32 libgsm.lib libsip2.lib libsipclient.lib libogg.lib libportaudio.lib libportmixer.lib libspeex.lib ws2_32.lib kernel32.lib user32.lib /nologo /base:"0x3EC20000" /dll /map /debug /debugtype:both /machine:I386 /out:"..\..\bin\release unicode\Plugins\sipW.dll" /pdbtype:sept /libpath:"lib/sipclient/Release" /filealign:0x200 /ALIGN:4096 /ignore:4108 +# ADD LINK32 libresample-i386-win32-vc6-release.lib libspeex-i386-win32-vc6-release.lib libsrtp-i386-win32-vc6-release.lib pjlib-i386-win32-vc6-release.lib pjlib-util-i386-win32-vc6-release.lib pjmedia-audiodev-i386-win32-vc6-release.lib pjmedia-codec-i386-win32-vc6-release.lib pjmedia-i386-win32-vc6-release.lib pjnath-i386-win32-vc6-release.lib pjsip-core-i386-win32-vc6-release.lib pjsip-simple-i386-win32-vc6-release.lib pjsip-ua-i386-win32-vc6-release.lib pjsua-lib-i386-win32-vc6-release.lib libg7221codec-i386-win32-vc6-release.lib libgsmcodec-i386-win32-vc6-release.lib libilbccodec-i386-win32-vc6-release.lib libmilenage-i386-win32-vc6-release.lib libportaudio-i386-win32-vc6-release.lib ws2_32.lib kernel32.lib user32.lib Ole32.lib Advapi32.lib Gdi32.lib Mswsock.lib /nologo /base:"0x3EC20000" /dll /map /debug /debugtype:both /machine:I386 /out:"..\..\bin\release unicode\Plugins\sipW.dll" /pdbtype:sept /libpath:"lib\pjsip\lib\vc6" /libpath:"lib\openssl\lib" /filealign:0x200 /ALIGN:4096 /ignore:4108 # SUBTRACT LINK32 /profile /pdb:none !ENDIF -- cgit v1.2.3