October 2007 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r5976 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 18 Oct '07

18 Oct '07

Author: anthm Date: Thu Oct 18 15:33:48 2007 New Revision: 5976 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: fix late neg codec change Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Thu Oct 18 15:33:48 2007 @@ -294,6 +294,8 @@ } else { if (switch_test_flag(tech_pvt, TFLAG_LATE_NEGOTIATION)) { char *r_sdp = switch_channel_get_variable(channel, SWITCH_R_SDP_VARIABLE); + tech_pvt->num_codecs = 0; + sofia_glue_tech_prepare_codecs(tech_pvt); if (sofia_glue_tech_media(tech_pvt, r_sdp) != SWITCH_STATUS_SUCCESS) { switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "CODEC NEGOTIATION ERROR"); nua_respond(tech_pvt->nh, SIP_488_NOT_ACCEPTABLE, TAG_END()); @@ -884,6 +886,8 @@ } else { if (switch_test_flag(tech_pvt, TFLAG_LATE_NEGOTIATION)) { char *r_sdp = switch_channel_get_variable(channel, SWITCH_R_SDP_VARIABLE); + tech_pvt->num_codecs = 0; + sofia_glue_tech_prepare_codecs(tech_pvt); if (sofia_glue_tech_media(tech_pvt, r_sdp) != SWITCH_STATUS_SUCCESS) { switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "CODEC NEGOTIATION ERROR"); nua_respond(tech_pvt->nh, SIP_488_NOT_ACCEPTABLE, TAG_END());

1 0

[commit] r5975 - freeswitch/trunk/conf
by Freeswitch SVN 18 Oct '07

18 Oct '07

Author: brian Date: Thu Oct 18 15:04:08 2007 New Revision: 5975 Modified: freeswitch/trunk/conf/directory.xml freeswitch/trunk/conf/voicemail.conf.xml Log: oops Modified: freeswitch/trunk/conf/directory.xml ============================================================================== --- freeswitch/trunk/conf/directory.xml (original) +++ freeswitch/trunk/conf/directory.xml Thu Oct 18 15:04:08 2007 @@ -1,7 +1,7 @@  <domain name="$${domain}">  - <user id="stpeter" mailbox="1000">  + <user id="brian" mailbox="1000">   <gateways>  @@ -35,7 +35,7 @@ </gateways> <params>  - <param name="password" value="mypass"/> + <param name="password" value="1234"/> <param name="vm-password" value="1234"/>   @@ -53,37 +53,35 @@ <vcard>  </vcard> - -  - <user id="1000" mailbox="1000"> - <params> - <param name="password" value="mypass"/> - <param name="vm-password" value="1234"/> -  -  - </params> - </user> - -  - <user id="1001"/> - <user id="1002"/> - <user id="1003"/> - <user id="1004"/> - <user id="1005"/> - <user id="1006"/> - <user id="1007"/> - <user id="1008"/> - <user id="1009"/> - <user id="1010"/> - <user id="1011"/> - <user id="1012"/> - <user id="1013"/> - <user id="1014"/> - <user id="1015"/> - <user id="1016"/> - <user id="1017"/> - <user id="1018"/> - <user id="1019"/> - </user> +  + <user id="1000" mailbox="1000"> + <params> + <param name="password" value="mypass"/> + <param name="vm-password" value="1234"/> +  +  + </params> + </user> + +  + <user id="1001"/> + <user id="1002"/> + <user id="1003"/> + <user id="1004"/> + <user id="1005"/> + <user id="1006"/> + <user id="1007"/> + <user id="1008"/> + <user id="1009"/> + <user id="1010"/> + <user id="1011"/> + <user id="1012"/> + <user id="1013"/> + <user id="1014"/> + <user id="1015"/> + <user id="1016"/> + <user id="1017"/> + <user id="1018"/> + <user id="1019"/> </domain> Modified: freeswitch/trunk/conf/voicemail.conf.xml ============================================================================== --- freeswitch/trunk/conf/voicemail.conf.xml (original) +++ freeswitch/trunk/conf/voicemail.conf.xml Thu Oct 18 15:04:08 2007 @@ -2,7 +2,7 @@ <settings> </settings> <profiles> - <profile name="demo"> + <profile name="default"> <param name="file-extension" value="wav"/> <param name="terminator-key" value="#"/> <param name="max-login-attempts" value="3"/>

1 0

[commit] r5974 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 18 Oct '07

18 Oct '07

Author: anthm Date: Thu Oct 18 14:40:20 2007 New Revision: 5974 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: fix conf Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Thu Oct 18 14:40:20 2007 @@ -1511,7 +1511,7 @@ uint32_t interval = read_codec->implementation->microseconds_per_frame / 1000; uint32_t csamples = switch_bytes_per_frame(member->conference->rate, member->conference->interval); uint32_t samples = switch_bytes_per_frame(member->conference->rate, interval); - uint32_t tsamples = switch_bytes_per_frame(read_codec->implementation->samples_per_second, interval); + uint32_t tsamples = switch_bytes_per_frame(read_codec->implementation->samples_per_second, interval) / 2; uint32_t low_count = 0, bytes = samples * 2; call_list_t *call_list = NULL, *cp = NULL;

1 0

[commit] r5973 - in freeswitch/trunk/src: . mod/codecs/mod_l16
by Freeswitch SVN 18 Oct '07

18 Oct '07

Author: anthm Date: Thu Oct 18 14:29:54 2007 New Revision: 5973 Modified: freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.c freeswitch/trunk/src/switch_core_codec.c Log: small change Modified: freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.c Thu Oct 18 14:29:54 2007 @@ -197,7 +197,7 @@ /*.ianacode */ 117, /*.iananame */ "L16", /*.fmtp */ NULL, - /*.samples_per_second */ 8000, + /*.samples_per_second */ 16000, /*.bits_per_second */ 256000, /*.microseconds_per_frame */ 120000, /*.samples_per_frame */ 1920, Modified: freeswitch/trunk/src/switch_core_codec.c ============================================================================== --- freeswitch/trunk/src/switch_core_codec.c (original) +++ freeswitch/trunk/src/switch_core_codec.c Thu Oct 18 14:29:54 2007 @@ -95,6 +95,12 @@ memset(codec, 0, sizeof(*codec)); + + if (channels == 2) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Stereo is not currently supported. please downsample audio source to mono.\n"); + return SWITCH_STATUS_GENERR; + } + if ((codec_interface = switch_loadable_module_get_codec_interface(codec_name)) == 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "invalid codec %s!\n", codec_name); return SWITCH_STATUS_GENERR;

1 0

[commit] r5972 - in freeswitch/trunk/src/mod: applications/mod_voicemail say/mod_say_de say/mod_say_es say/mod_say_fr say/mod_say_it say/mod_say_nl
by Freeswitch SVN 18 Oct '07

18 Oct '07

Author: mikej Date: Thu Oct 18 14:17:55 2007 New Revision: 5972 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/ (props changed) freeswitch/trunk/src/mod/say/mod_say_de/ (props changed) freeswitch/trunk/src/mod/say/mod_say_es/ (props changed) freeswitch/trunk/src/mod/say/mod_say_fr/ (props changed) freeswitch/trunk/src/mod/say/mod_say_it/ (props changed) freeswitch/trunk/src/mod/say/mod_say_nl/ (props changed) Log: svn:ignore props

1 0

[commit] r5971 - in freeswitch/trunk: . src/mod/applications/mod_dptools src/mod/applications/mod_enum src/mod/applications/mod_esf src/mod/applications/mod_rss src/mod/applications/mod_voicemail src/mod/asr_tts/mod_cepstral src/mod/asr_tts/mod_openmrcp src/mod/codecs/mod_g711 src/mod/codecs/mod_g722 src/mod/codecs/mod_g723_1 src/mod/codecs/mod_g726 src/mod/codecs/mod_g729 src/mod/codecs/mod_gsm src/mod/codecs/mod_h26x src/mod/codecs/mod_ilbc src/mod/codecs/mod_l16 src/mod/codecs/mod_speex
by Freeswitch SVN 18 Oct '07

18 Oct '07

Author: mikej Date: Thu Oct 18 14:11:43 2007 New Revision: 5971 Modified: freeswitch/trunk/Freeswitch.sln freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.vcproj freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.vcproj freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.vcproj freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.vcproj freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.vcproj freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.vcproj freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.vcproj freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.vcproj freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.vcproj freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.vcproj freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.vcproj freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.vcproj freeswitch/trunk/src/mod/codecs/mod_gsm/mod_gsm.vcproj freeswitch/trunk/src/mod/codecs/mod_h26x/mod_h26x.vcproj freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.vcproj freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.vcproj freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.vcproj freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.vcproj freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.vcproj freeswitch/trunk/src/mod/directories/mod_ldap/mod_ldap.vcproj freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.vcproj freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.vcproj freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_PortAudio.vcproj freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.vcproj freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.vcproj freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.vcproj freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.vcproj freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.vcproj freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.vcproj freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.vcproj freeswitch/trunk/src/mod/formats/mod_native_file/mod_native_file.vcproj freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.vcproj freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.vcproj freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.vcproj freeswitch/trunk/src/mod/loggers/mod_console/mod_console.vcproj freeswitch/trunk/src/mod/say/mod_say_de/mod_say_de.vcproj freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.vcproj freeswitch/trunk/src/mod/say/mod_say_es/mod_say_es.vcproj freeswitch/trunk/src/mod/say/mod_say_fr/mod_say_fr.vcproj freeswitch/trunk/src/mod/say/mod_say_it/mod_say_it.vcproj freeswitch/trunk/src/mod/say/mod_say_nl/mod_say_nl.vcproj freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.vcproj freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.vcproj freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj freeswitch/trunk/w32/module_debug.vsprops freeswitch/trunk/w32/module_release.vsprops freeswitch/trunk/w32/modules.vsprops Log: move some modules to use .vsprops files to centralize where settings are made and to simplify the project files. Modified: freeswitch/trunk/Freeswitch.sln ============================================================================== --- freeswitch/trunk/Freeswitch.sln (original) +++ freeswitch/trunk/Freeswitch.sln Thu Oct 18 14:11:43 2007 @@ -3,20 +3,20 @@ # Visual Studio 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeSwitchConsole", "w32\Console\FreeSwitchConsole.vcproj", "{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeSwitchCoreLib", "w32\Library\FreeSwitchCore.vcproj", "{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}" ProjectSection(ProjectDependencies) = postProject - {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761} = {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761} - {8D04B550-D240-4A44-8A18-35DA3F7038D9} = {8D04B550-D240-4A44-8A18-35DA3F7038D9} - {89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C} - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {EEF031CB-FED8-451E-A471-91EC8D4F6750} = {EEF031CB-FED8-451E-A471-91EC8D4F6750} - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} + {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} + {EEF031CB-FED8-451E-A471-91EC8D4F6750} = {EEF031CB-FED8-451E-A471-91EC8D4F6750} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C} + {8D04B550-D240-4A44-8A18-35DA3F7038D9} = {8D04B550-D240-4A44-8A18-35DA3F7038D9} + {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761} = {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g729", "src\mod\codecs\mod_g729\mod_g729.vcproj", "{1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}" @@ -26,15 +26,15 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_gsm", "src\mod\codecs\mod_gsm\mod_gsm.vcproj", "{4926323F-4EA8-4B7D-A3D3-65488725988F}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {8FD2E297-4096-47E5-9258-C48FF1841523} = {8FD2E297-4096-47E5-9258-C48FF1841523} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_sndfile", "src\mod\formats\mod_sndfile\mod_sndfile.vcproj", "{AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {3D0370CA-BED2-4657-A475-32375CBCB6E4} = {3D0370CA-BED2-4657-A475-32375CBCB6E4} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g711", "src\mod\codecs\mod_g711\mod_g711.vcproj", "{B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}" @@ -44,16 +44,16 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_iax", "src\mod\endpoints\mod_iax\mod_iax.vcproj", "{3A5B9131-F20C-4A85-9447-6C1610941CEE}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E} = {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_PortAudio", "src\mod\endpoints\mod_portaudio\mod_PortAudio.vcproj", "{5FD31A25-5D83-4794-8BEE-904DAD84CE71}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} - {0A18A071-125E-442F-AFF7-A3F68ABECF99} = {0A18A071-125E-442F-AFF7-A3F68ABECF99} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {0A18A071-125E-442F-AFF7-A3F68ABECF99} = {0A18A071-125E-442F-AFF7-A3F68ABECF99} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_l16", "src\mod\codecs\mod_l16\mod_l16.vcproj", "{5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}" @@ -63,14 +63,14 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_speex", "src\mod\codecs\mod_speex\mod_speex.vcproj", "{5580D60E-0F77-4716-9CD4-B8E5986FA375}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {1C469CDD-A3AF-4A94-A592-B2CF12F2D918} = {1C469CDD-A3AF-4A94-A592-B2CF12F2D918} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_woomera", "src\mod\endpoints\mod_woomera\mod_woomera.vcproj", "{FE3540C5-3303-46E0-A69E-D92F775687F1}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Codecs", "Codecs", "{F881ADA2-2F1A-4046-9FEB-191D9422D781}" @@ -91,8 +91,8 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dialplan_xml", "src\mod\dialplans\mod_dialplan_xml\mod_dialplan_xml.vcproj", "{07113B25-D3AF-4E04-BA77-4CD1171F022C}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "FreeSwitchSetup", "w32\Setup\Setup.vdproj", "{B17FFBE6-A942-4056-8346-B624FB5D995B}" @@ -106,22 +106,22 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dialplan_directory", "src\mod\dialplans\mod_dialplan_directory\mod_dialplan_directory.vcproj", "{A27CCA23-1541-4337-81A4-F0A6413078A0}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_zeroconf", "src\mod\event_handlers\mod_zeroconf\mod_zeroconf.vcproj", "{C7705DC4-2088-493E-AF8D-65BC6D65C125}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} - {49C34584-B6DA-448F-83CF-27584DC9FC90} = {49C34584-B6DA-448F-83CF-27584DC9FC90} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {0D826AF5-0506-4C50-BB8B-7DB019AC21AE} = {0D826AF5-0506-4C50-BB8B-7DB019AC21AE} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {49C34584-B6DA-448F-83CF-27584DC9FC90} = {49C34584-B6DA-448F-83CF-27584DC9FC90} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_event_multicast", "src\mod\event_handlers\mod_event_multicast\mod_event_multicast.vcproj", "{784113EF-44D9-4949-835D-7065D3C7AD08}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libteletone", "libs\libteletone\libteletone.vcproj", "{89385C74-5860-4174-9CAF-A39E7C48909C}" @@ -130,10 +130,10 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey", "src\mod\languages\mod_spidermonkey\mod_spidermonkey.vcproj", "{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D} + {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ASR-TTS", "ASR-TTS", "{4CF6A6AC-07DE-4B9E-ABE1-7F98B64E0BB0}" @@ -155,22 +155,22 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_ilbc", "src\mod\codecs\mod_ilbc\mod_ilbc.vcproj", "{D3EC0AFF-76FC-4210-A825-9A17410660A3}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {989BB874-7AF1-44CB-8E5C-CC8113D267E8} = {989BB874-7AF1-44CB-8E5C-CC8113D267E8} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dingaling", "src\mod\endpoints\mod_dingaling\mod_dingaling.vcproj", "{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}" ProjectSection(ProjectDependencies) = postProject - {1906D736-08BD-4EE1-924F-B536249B9A54} = {1906D736-08BD-4EE1-924F-B536249B9A54} - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {E727E8F6-935D-46FE-8B0E-37834748A0E3} = {E727E8F6-935D-46FE-8B0E-37834748A0E3} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {1906D736-08BD-4EE1-924F-B536249B9A54} = {1906D736-08BD-4EE1-924F-B536249B9A54} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_commands", "src\mod\applications\mod_commands\mod_commands.vcproj", "{30A5B29C-983E-4580-9FD0-D647CCDCC7EB}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Loggers", "Loggers", "{A7AB4405-FDB7-4853-9FBB-1516B1C3D80A}" @@ -184,42 +184,41 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_rpc", "src\mod\xml_int\mod_xml_rpc\mod_xml_rpc.vcproj", "{CBEC7225-0C21-4DA8-978E-1F158F8AD950}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} - {356EC96D-4C9F-47B5-9083-FC328B87BA94} = {356EC96D-4C9F-47B5-9083-FC328B87BA94} - {A3FE0076-B366-429D-A238-D7304DA7D3C1} = {A3FE0076-B366-429D-A238-D7304DA7D3C1} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} {155844C3-EC5F-407F-97A4-A2DDADED9B2F} = {155844C3-EC5F-407F-97A4-A2DDADED9B2F} + {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} + {A3FE0076-B366-429D-A238-D7304DA7D3C1} = {A3FE0076-B366-429D-A238-D7304DA7D3C1} + {356EC96D-4C9F-47B5-9083-FC328B87BA94} = {356EC96D-4C9F-47B5-9083-FC328B87BA94} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_rss", "src\mod\applications\mod_rss\mod_rss.vcproj", "{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_conference", "src\mod\applications\mod_conference\mod_conference.vcproj", "{C24FB505-05D7-4319-8485-7540B44C8603}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dptools", "src\mod\applications\mod_dptools\mod_dptools.vcproj", "{B5881A85-FE70-4F64-8607-2CAAE52669C6}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_event_socket", "src\mod\event_handlers\mod_event_socket\mod_event_socket.vcproj", "{05515420-16DE-4E63-BE73-85BE85BA5142}" ProjectSection(ProjectDependencies) = postProject - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_cdr", "src\mod\event_handlers\mod_cdr\mod_cdr.vcproj", "{3D1EED36-A510-4EDB-B4D9-4E0F4A5EC2A8}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Libraries", "_Libraries", "{EB910B0D-F27D-4B62-B67B-DE834C99AC5B}" @@ -232,8 +231,8 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdingaling", "libs\libdingaling\libdingaling.vcproj", "{1906D736-08BD-4EE1-924F-B536249B9A54}" ProjectSection(ProjectDependencies) = postProject - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} {E727E8F6-935D-46FE-8B0E-37834748A0E3} = {E727E8F6-935D-46FE-8B0E-37834748A0E3} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsrtp", "libs\srtp\libsrtp.vcproj", "{EEF031CB-FED8-451E-A471-91EC8D4F6750}" @@ -258,8 +257,8 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libaprutil", "libs\win32\apr-util\libaprutil.vcproj", "{F057DA7F-79E5-4B00-845C-EF446EF055E3}" ProjectSection(ProjectDependencies) = postProject - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Downloads", "_Downloads", "{C120A020-773F-4EA3-923F-B67AF28B750D}" @@ -277,8 +276,8 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mDNSResponder static library", "libs\win32\howl\libmDNSResponder.vcproj", "{49C34584-B6DA-448F-83CF-27584DC9FC90}" ProjectSection(ProjectDependencies) = postProject - {5927104D-C14C-4AC8-925C-4AB681762E75} = {5927104D-C14C-4AC8-925C-4AB681762E75} {0D826AF5-0506-4C50-BB8B-7DB019AC21AE} = {0D826AF5-0506-4C50-BB8B-7DB019AC21AE} + {5927104D-C14C-4AC8-925C-4AB681762E75} = {5927104D-C14C-4AC8-925C-4AB681762E75} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsndfile", "libs\win32\libsndfile\libsndfile.vcproj", "{3D0370CA-BED2-4657-A475-32375CBCB6E4}" @@ -298,34 +297,34 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_sofia", "src\mod\endpoints\mod_sofia\mod_sofia.vcproj", "{0DF3ABD0-DDC0-4265-B778-07C66780979B}" ProjectSection(ProjectDependencies) = postProject - {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libg726", "libs\codec\g726\libg726.vcproj", "{5A6A281A-AA50-470A-8305-202BDA1CD1BF}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g726", "src\mod\codecs\mod_g726\mod_g726.vcproj", "{486369EB-F150-4B56-BCC8-77B9E18FF5F5}" ProjectSection(ProjectDependencies) = postProject - {5A6A281A-AA50-470A-8305-202BDA1CD1BF} = {5A6A281A-AA50-470A-8305-202BDA1CD1BF} - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {5A6A281A-AA50-470A-8305-202BDA1CD1BF} = {5A6A281A-AA50-470A-8305-202BDA1CD1BF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libg7xx", "libs\codec\g7xx\libg7xx.vcproj", "{D71E7338-8D9C-4FE4-A15F-D5CC60202C7C}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g722", "src\mod\codecs\mod_g722\mod_g722.vcproj", "{D42518CC-7475-454D-B392-0E132C07D761}" ProjectSection(ProjectDependencies) = postProject - {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C} = {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C} - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C} = {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsofia_sip_ua_static", "libs\win32\sofia\libsofia_sip_ua_static.vcproj", "{70A49BC2-7500-41D0-B75D-EDCC5BE987A0}" ProjectSection(ProjectDependencies) = postProject - {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A} = {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A} + {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download PTHREAD", "libs\win32\Download PTHREAD.vcproj", "{8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}" @@ -337,82 +336,82 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g723_1", "src\mod\codecs\mod_g723_1\mod_g723_1.vcproj", "{FEA1EEF7-876F-48DE-88BF-C0E3E606D758}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_native_file", "src\mod\formats\mod_native_file\mod_native_file.vcproj", "{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_core_db", "src\mod\languages\mod_spidermonkey_core_db\mod_spidermonkey_core_db.vcproj", "{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}" ProjectSection(ProjectDependencies) = postProject - {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_teletone", "src\mod\languages\mod_spidermonkey_teletone\mod_spidermonkey_teletone.vcproj", "{8F992C49-6C51-412F-B2A3-34EAB708EB65}" ProjectSection(ProjectDependencies) = postProject - {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} - {89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libudns", "libs\win32\udns\libudns.vcproj", "{4043FC6A-9A30-4577-8AD5-9B233C9575D8}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_enum", "src\mod\applications\mod_enum\mod_enum.vcproj", "{71A967D5-0E99-4CEF-A587-98836EE6F2EF}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {4043FC6A-9A30-4577-8AD5-9B233C9575D8} = {4043FC6A-9A30-4577-8AD5-9B233C9575D8} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_etpan", "src\mod\languages\mod_spidermonkey_etpan\mod_spidermonkey_etpan.vcproj", "{D6C82F86-2B05-4A7F-8CC6-D2592E66FBB9}" ProjectSection(ProjectDependencies) = postProject - {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} - {BA4DED3C-E56F-4484-BFC3-9C13E461A1BE} = {BA4DED3C-E56F-4484-BFC3-9C13E461A1BE} - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {BA4DED3C-E56F-4484-BFC3-9C13E461A1BE} = {BA4DED3C-E56F-4484-BFC3-9C13E461A1BE} + {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_odbc", "src\mod\languages\mod_spidermonkey_odbc\mod_spidermonkey_odbc.vcproj", "{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}" ProjectSection(ProjectDependencies) = postProject - {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libetpan", "libs\win32\etpan\libetpan.vcproj", "{BA4DED3C-E56F-4484-BFC3-9C13E461A1BE}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_curl", "src\mod\xml_int\mod_xml_curl\mod_xml_curl.vcproj", "{AB91A099-7690-4ECF-8994-E458F4EA1ED4}" ProjectSection(ProjectDependencies) = postProject - {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "say", "say", "{6CD61A1D-797C-470A-BE08-8C31B68BB336}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_say_en", "src\mod\say\mod_say_en\mod_say_en.vcproj", "{988CACF7-3FCB-4992-BE69-77872AE67DC8}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "portaudio", "libs\portaudio\build\msvc\portaudio.vcproj", "{0A18A071-125E-442F-AFF7-A3F68ABECF99}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_cdr", "src\mod\xml_int\mod_xml_cdr\mod_xml_cdr.vcproj", "{08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}" ProjectSection(ProjectDependencies) = postProject - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_amr", "src\mod\codecs\mod_amr\mod_amr.vcproj", "{8DEB383C-4091-4F42-A56F-C9E46D552D79}" @@ -565,16 +564,16 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpcore", "libs\openmrcp\mrcpcore\mrcpcore.vcproj", "{829A9309-3B94-43C0-846B-7EC9D6D35F8B}" ProjectSection(ProjectDependencies) = postProject - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {AA91F0AC-6562-435E-814C-5C94689FEFA2} = {AA91F0AC-6562-435E-814C-5C94689FEFA2} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rtspcore", "libs\openmrcp\rtspcore\rtspcore.vcproj", "{EB751DC4-87BD-4766-B78D-DFB64BA9F988}" ProjectSection(ProjectDependencies) = postProject - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} {829A9309-3B94-43C0-846B-7EC9D6D35F8B} = {829A9309-3B94-43C0-846B-7EC9D6D35F8B} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpmediaframe", "libs\openmrcp\module\mrcpmediaframe\mrcpmediaframe.vcproj", "{9EA22C31-BB7E-4C40-A698-2C6792D1E0C6}" @@ -591,8 +590,8 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpsofiasip", "libs\openmrcp\module\mrcpsofiasip\mrcpsofiasip.vcproj", "{819C7242-6184-46FE-BC7B-C7E25C0581EE}" ProjectSection(ProjectDependencies) = postProject - {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} {829A9309-3B94-43C0-846B-7EC9D6D35F8B} = {829A9309-3B94-43C0-846B-7EC9D6D35F8B} + {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpv2agent", "libs\openmrcp\module\mrcpv2agent\mrcpv2agent.vcproj", "{FB64EA08-3BC0-48AE-BE4B-74F1024B756E}" @@ -602,27 +601,27 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libopenmrcpclient", "libs\openmrcp\platform\openmrcpclient\libopenmrcpclient.vcproj", "{A407B661-D7DC-4E30-B268-FFF3296C35E6}" ProjectSection(ProjectDependencies) = postProject - {CF78E84D-8456-44F2-8197-0E0E88D30A3C} = {CF78E84D-8456-44F2-8197-0E0E88D30A3C} - {819C7242-6184-46FE-BC7B-C7E25C0581EE} = {819C7242-6184-46FE-BC7B-C7E25C0581EE} - {9EA22C31-BB7E-4C40-A698-2C6792D1E0C6} = {9EA22C31-BB7E-4C40-A698-2C6792D1E0C6} {FB64EA08-3BC0-48AE-BE4B-74F1024B756E} = {FB64EA08-3BC0-48AE-BE4B-74F1024B756E} + {9EA22C31-BB7E-4C40-A698-2C6792D1E0C6} = {9EA22C31-BB7E-4C40-A698-2C6792D1E0C6} + {819C7242-6184-46FE-BC7B-C7E25C0581EE} = {819C7242-6184-46FE-BC7B-C7E25C0581EE} + {CF78E84D-8456-44F2-8197-0E0E88D30A3C} = {CF78E84D-8456-44F2-8197-0E0E88D30A3C} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_openmrcp", "src\mod\asr_tts\mod_openmrcp\mod_openmrcp.vcproj", "{E7116F50-2B10-472F-92BD-C8667AA9C1AE}" ProjectSection(ProjectDependencies) = postProject - {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} - {A407B661-D7DC-4E30-B268-FFF3296C35E6} = {A407B661-D7DC-4E30-B268-FFF3296C35E6} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {A407B661-D7DC-4E30-B268-FFF3296C35E6} = {A407B661-D7DC-4E30-B268-FFF3296C35E6} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_socket", "src\mod\languages\mod_spidermonkey_socket\mod_spidermonkey_socket.vcproj", "{028C7278-05D7-4E18-82FE-BE231B844F41}" ProjectSection(ProjectDependencies) = postProject - {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_voicemail", "src\mod\applications\mod_voicemail\mod_voicemail.vcproj", "{D7F1E3F2-A3F4-474C-8555-15122571AF52}" Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.vcproj Thu Oct 18 14:11:43 2007 @@ -38,12 +38,7 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="0" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" UsePrecompiledHeader="0" /> <Tool @@ -108,8 +103,6 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="2" UsePrecompiledHeader="0" /> <Tool @@ -124,8 +117,6 @@ <Tool Name="VCLinkerTool" AdditionalLibraryDirectories="" - OptimizeReferences="2" - EnableCOMDATFolding="2" /> <Tool Name="VCALinkTool" Modified: freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.vcproj Thu Oct 18 14:11:43 2007 @@ -39,10 +39,6 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\udns"" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" UsePrecompiledHeader="0" /> <Tool @@ -108,8 +104,6 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\udns"" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="2" UsePrecompiledHeader="0" /> <Tool @@ -125,8 +119,6 @@ Name="VCLinkerTool" AdditionalDependencies="ws2_32.lib" AdditionalLibraryDirectories="" - OptimizeReferences="2" - EnableCOMDATFolding="2" /> <Tool Name="VCALinkTool" Modified: freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.vcproj Thu Oct 18 14:11:43 2007 @@ -38,12 +38,7 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="0" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" UsePrecompiledHeader="0" /> <Tool @@ -109,8 +104,6 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="2" UsePrecompiledHeader="0" /> <Tool @@ -126,8 +119,6 @@ Name="VCLinkerTool" AdditionalDependencies="Ws2_32.lib " AdditionalLibraryDirectories="" - OptimizeReferences="2" - EnableCOMDATFolding="2" /> <Tool Name="VCALinkTool" Modified: freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.vcproj Thu Oct 18 14:11:43 2007 @@ -108,8 +108,6 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="2" UsePrecompiledHeader="0" /> <Tool @@ -124,8 +122,6 @@ <Tool Name="VCLinkerTool" AdditionalLibraryDirectories="" - OptimizeReferences="2" - EnableCOMDATFolding="2" /> <Tool Name="VCALinkTool" Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.vcproj Thu Oct 18 14:11:43 2007 @@ -17,8 +17,6 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -40,17 +38,8 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include"" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" + AdditionalIncludeDirectories="" UsePrecompiledHeader="0" - WarningLevel="4" - WarnAsError="true" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -63,14 +52,7 @@ /> <Tool Name="VCLinkerTool" - OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" - LinkIncremental="1" - AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" - SubSystem="2" - ImportLibrary="$(OutDir)/mod_voicemail.lib" - TargetMachine="1" + AdditionalLibraryDirectories="" /> <Tool Name="VCALinkTool" @@ -99,8 +81,6 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" @@ -122,14 +102,8 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include"" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="2" + AdditionalIncludeDirectories="" UsePrecompiledHeader="0" - WarningLevel="4" - WarnAsError="true" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -142,16 +116,7 @@ /> <Tool Name="VCLinkerTool" - OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" - LinkIncremental="1" - AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" - SubSystem="2" - OptimizeReferences="2" - EnableCOMDATFolding="2" - ImportLibrary="$(OutDir)/mod_voicemail.lib" - TargetMachine="1" + AdditionalLibraryDirectories="" /> <Tool Name="VCALinkTool" Modified: freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.vcproj ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.vcproj (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.vcproj Thu Oct 18 14:11:43 2007 @@ -39,12 +39,7 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="0" AdditionalIncludeDirectories=""C:\Program Files\Cepstral\sdk\include"" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" UsePrecompiledHeader="0" /> <Tool @@ -111,8 +106,6 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories=""C:\Program Files\Cepstral\sdk\include"" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="2" UsePrecompiledHeader="0" /> <Tool @@ -128,9 +121,6 @@ Name="VCLinkerTool" AdditionalDependencies="swift.lib" AdditionalLibraryDirectories=""C:\Program Files\Cepstral\sdk\lib\winnt"" - OptimizeReferences="2" - EnableCOMDATFolding="2" - LinkTimeCodeGeneration="1" /> <Tool Name="VCALinkTool" Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.vcproj ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.vcproj (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.vcproj Thu Oct 18 14:11:43 2007 @@ -39,12 +39,7 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="0" AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\openmrcp\platform\openmrcpclient\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\client\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\parser\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\media\include";"$(InputDir)..\..\..\..\libs\openmrcp\mediaframe\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\resource\include";"$(InputDir)..\..\..\..\libs\apr\include"" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" UsePrecompiledHeader="0" /> <Tool @@ -111,8 +106,6 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\openmrcp\platform\openmrcpclient\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\client\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\parser\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\media\include";"$(InputDir)..\..\..\..\libs\openmrcp\mediaframe\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\resource\include";"$(InputDir)..\..\..\..\libs\apr\include"" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="2" UsePrecompiledHeader="0" /> <Tool @@ -128,9 +121,6 @@ Name="VCLinkerTool" AdditionalDependencies="ws2_32.lib advapi32.lib iphlpapi.lib" AdditionalLibraryDirectories=""C:\Program Files\openmrcp\sdk\lib\winnt"" - OptimizeReferences="2" - EnableCOMDATFolding="2" - LinkTimeCodeGeneration="1" /> <Tool Name="VCALinkTool" @@ -181,12 +171,7 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="0" AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\openmrcp\platform\openmrcpclient\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\client\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\parser\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\media\include";"$(InputDir)..\..\..\..\libs\openmrcp\mediaframe\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\resource\include";"$(InputDir)..\..\..\..\libs\apr\include"" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" UsePrecompiledHeader="0" /> <Tool Modified: freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.vcproj ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.vcproj (original) +++ freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.vcproj Thu Oct 18 14:11:43 2007 @@ -38,12 +38,7 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="0" AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\codec\g7xx\src\include"" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" UsePrecompiledHeader="0" /> <Tool @@ -57,7 +52,6 @@ /> <Tool Name="VCLinkerTool" - LinkIncremental="2" AdditionalLibraryDirectories="" /> <Tool @@ -109,8 +103,6 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\codec\g7xx\src\include"" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="2" UsePrecompiledHeader="0" /> <Tool @@ -124,10 +116,7 @@ /> <Tool Name="VCLinkerTool" - LinkIncremental="2" AdditionalLibraryDirectories="" - OptimizeReferences="2" - EnableCOMDATFolding="2" /> <Tool Name="VCALinkTool" Modified: freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.vcproj ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.vcproj (original) +++ freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.vcproj Thu Oct 18 14:11:43 2007 @@ -39,12 +39,7 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="0" AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\codec\g7xx\src\include"" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" UsePrecompiledHeader="0" /> <Tool @@ -110,8 +105,6 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\codec\g7xx\src\include"" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="2" UsePrecompiledHeader="0" /> <Tool @@ -126,9 +119,6 @@ <Tool Name="VCLinkerTool" AdditionalLibraryDirectories=""..\..\..\..\libs\codec\g726\$(OutDir)"" - OptimizeReferences="2" - EnableCOMDATFolding="2" - LinkTimeCodeGeneration="1" /> <Tool Name="VCALinkTool" Modified: freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.vcproj ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.vcproj (original) +++ freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.vcproj Thu Oct 18 14:11:43 2007 @@ -17,8 +17,6 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -41,17 +39,8 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\codec\libg723\src\include"" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="2" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\codec\libg723\src\include"" UsePrecompiledHeader="0" - WarningLevel="4" - WarnAsError="true" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -64,12 +53,8 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="libg723.lib FreeSwitchCore.lib" - OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" - LinkIncremental="1" - AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" + AdditionalDependencies="libg723.lib" + AdditionalLibraryDirectories="" SubSystem="2" ImportLibrary="$(OutDir)/mod_g723_1.lib" TargetMachine="1" @@ -101,8 +86,6 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" @@ -125,13 +108,8 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\codec\libg723\src\include"" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="0" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\codec\libg723\src\include"" UsePrecompiledHeader="0" - WarningLevel="4" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -144,17 +122,8 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="libg723.lib FreeSwitchCore.lib" - OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" - LinkIncremental="1" - AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" - SubSystem="2" - OptimizeReferences="2" - EnableCOMDATFolding="2" - ImportLibrary="$(OutDir)/mod_g723_1.lib" - TargetMachine="1" + AdditionalDependencies="libg723.lib" + AdditionalLibraryDirectories="" /> <Tool Name="VCALinkTool" @@ -183,8 +152,6 @@ </Configuration> <Configuration Name="Debug Passthrough|Win32" - OutputDirectory="Debug" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -207,17 +174,9 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\codec\libg723\src\include"" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;G723_PASSTHROUGH" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\codec\libg723\src\include"" + PreprocessorDefinitions="G723_PASSTHROUGH" UsePrecompiledHeader="0" - WarningLevel="4" - WarnAsError="true" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -230,14 +189,7 @@ /> <Tool Name="VCLinkerTool" - OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" - LinkIncremental="1" - AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" - SubSystem="2" - ImportLibrary="$(OutDir)/mod_g723_1.lib" - TargetMachine="1" + AdditionalLibraryDirectories="" /> <Tool Name="VCALinkTool" @@ -266,8 +218,6 @@ </Configuration> <Configuration Name="Release Passthrough|Win32" - OutputDirectory="Release" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" @@ -290,13 +240,9 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\codec\libg723\src\include"" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;G723_PASSTHROUGH" - RuntimeLibrary="2" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\codec\libg723\src\include"" + PreprocessorDefinitions="G723_PASSTHROUGH" UsePrecompiledHeader="0" - WarningLevel="4" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -309,16 +255,7 @@ /> <Tool Name="VCLinkerTool" - OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" - LinkIncremental="1" - AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" - SubSystem="2" - OptimizeReferences="2" - EnableCOMDATFolding="2" - ImportLibrary="$(OutDir)/mod_g723_1.lib" - TargetMachine="1" + AdditionalLibraryDirectories="" /> <Tool Name="VCALinkTool" Modified: freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.vcproj ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.vcproj (original) +++ freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.vcproj Thu Oct 18 14:11:43 2007 @@ -110,8 +110,6 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\codec\g726\src"" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="2" UsePrecompiledHeader="0" /> <Tool @@ -126,9 +124,6 @@ <Tool Name="VCLinkerTool" AdditionalLibraryDirectories=""..\..\..\..\libs\codec\g726\$(OutDir)"" - OptimizeReferences="2" - EnableCOMDATFolding="2" - LinkTimeCodeGeneration="1" /> <Tool Name="VCALinkTool" Modified: freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.vcproj ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.vcproj (original) +++ freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.vcproj Thu Oct 18 14:11:43 2007 @@ -111,8 +111,6 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\codec\libg729\src\include"" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="2" UsePrecompiledHeader="0" /> <Tool @@ -126,10 +124,8 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="libg729.lib FreeSwitchCore.lib" + AdditionalDependencies="libg729.lib" AdditionalLibraryDirectories="" - OptimizeReferences="2" - EnableCOMDATFolding="2" /> <Tool Name="VCALinkTool" Modified: freeswitch/trunk/src/mod/codecs/mod_gsm/mod_gsm.vcproj ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_gsm/mod_gsm.vcproj (original) +++ freeswitch/trunk/src/mod/codecs/mod_gsm/mod_gsm.vcproj Thu Oct 18 14:11:43 2007 @@ -110,8 +110,6 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\codec\gsm\inc"" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="2" UsePrecompiledHeader="0" /> <Tool @@ -126,9 +124,6 @@ <Tool Name="VCLinkerTool" AdditionalLibraryDirectories=""..\..\..\..\libs\codec\gsm\$(OutDir)"" - OptimizeReferences="2" - EnableCOMDATFolding="2" - LinkTimeCodeGeneration="1" /> <Tool Name="VCALinkTool" Modified: freeswitch/trunk/src/mod/codecs/mod_h26x/mod_h26x.vcproj ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_h26x/mod_h26x.vcproj (original) +++ freeswitch/trunk/src/mod/codecs/mod_h26x/mod_h26x.vcproj Thu Oct 18 14:11:43 2007 @@ -110,8 +110,6 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\libresample\include"" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="2" UsePrecompiledHeader="0" /> <Tool @@ -126,8 +124,6 @@ <Tool Name="VCLinkerTool" AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\libresample\win"" - OptimizeReferences="2" - EnableCOMDATFolding="2" /> <Tool Name="VCALinkTool" Modified: freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.vcproj ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.vcproj (original) +++ freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.vcproj Thu Oct 18 14:11:43 2007 @@ -110,8 +110,6 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\codec\ilbc\src"" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="2" UsePrecompiledHeader="0" /> <Tool @@ -126,9 +124,6 @@ <Tool Name="VCLinkerTool" AdditionalLibraryDirectories=""..\..\..\..\libs\codec\ilbc\$(OutDir)"" - OptimizeReferences="2" - EnableCOMDATFolding="2" - LinkTimeCodeGeneration="1" /> <Tool Name="VCALinkTool" Modified: freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.vcproj ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.vcproj (original) +++ freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.vcproj Thu Oct 18 14:11:43 2007 @@ -110,8 +110,6 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\libresample\include"" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="2" UsePrecompiledHeader="0" /> <Tool @@ -126,8 +124,6 @@ <Tool Name="VCLinkerTool" AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\libresample\win"" - OptimizeReferences="2" - EnableCOMDATFolding="2" /> <Tool Name="VCALinkTool" Modified: freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.vcproj ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.vcproj (original) +++ freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.vcproj Thu Oct 18 14:11:43 2007 @@ -17,8 +17,6 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -41,17 +39,8 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\speex\include";"$(InputDir)..\..\..\..\libs\speex\include\speex"" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\speex\include";"$(InputDir)..\..\..\..\libs\speex\include\speex"" UsePrecompiledHeader="0" - WarningLevel="4" - WarnAsError="true" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -64,14 +53,7 @@ /> <Tool Name="VCLinkerTool" - OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" - LinkIncremental="1" - AdditionalLibraryDirectories="$(InputDir)..\..\..\..\libs\speex-1.1.11.1\win32\libspeex\$(OutDir);..\..\..\..\w32\vsnet\$(OutDir)" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" - SubSystem="2" - ImportLibrary="$(OutDir)/mod_speex.lib" - TargetMachine="1" + AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\speex-1.1.11.1\win32\libspeex\$(OutDir)"" /> <Tool Name="VCALinkTool" @@ -100,8 +82,6 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" @@ -124,13 +104,8 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\speex\include";"$(InputDir)..\..\..\..\libs\speex\include\speex"" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="2" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\speex\include";"$(InputDir)..\..\..\..\libs\speex\include\speex"" UsePrecompiledHeader="0" - WarningLevel="4" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -143,16 +118,7 @@ /> <Tool Name="VCLinkerTool" - OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" - LinkIncremental="1" - AdditionalLibraryDirectories="$(InputDir)..\..\..\..\libs\speex-1.1.11.1\win32\libspeex\$(OutDir);..\..\..\..\w32\vsnet\$(OutDir)" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" - SubSystem="2" - OptimizeReferences="2" - EnableCOMDATFolding="2" - ImportLibrary="$(OutDir)/mod_speex.lib" - TargetMachine="1" + AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\speex-1.1.11.1\win32\libspeex\$(OutDir)"" /> <Tool Name="VCALinkTool" Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.vcproj ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.vcproj (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.vcproj Thu Oct 18 14:11:43 2007 @@ -38,12 +38,7 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="0" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" UsePrecompiledHeader="0" WarnAsError="true" /> @@ -109,8 +104,6 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="2" UsePrecompiledHeader="0" /> <Tool @@ -125,8 +118,6 @@ <Tool Name="VCLinkerTool" AdditionalLibraryDirectories="" - OptimizeReferences="2" - EnableCOMDATFolding="2" /> <Tool Name="VCALinkTool" Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.vcproj ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.vcproj (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.vcproj Thu Oct 18 14:11:43 2007 @@ -39,14 +39,8 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="0" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" UsePrecompiledHeader="0" - WarnAsError="true" /> <Tool Name="VCManagedResourceCompilerTool" @@ -111,8 +105,6 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="2" UsePrecompiledHeader="0" /> <Tool @@ -127,8 +119,6 @@ <Tool Name="VCLinkerTool" AdditionalLibraryDirectories="" - OptimizeReferences="2" - EnableCOMDATFolding="2" /> <Tool Name="VCALinkTool" Modified: freeswitch/trunk/src/mod/directories/mod_ldap/mod_ldap.vcproj ============================================================================== --- freeswitch/trunk/src/mod/directories/mod_ldap/mod_ldap.vcproj (original) +++ freeswitch/trunk/src/mod/directories/mod_ldap/mod_ldap.vcproj Thu Oct 18 14:11:43 2007 @@ -112,8 +112,6 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\openldap\include"" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;LDAP_DEPRECATED" - RuntimeLibrary="2" UsePrecompiledHeader="0" /> <Tool @@ -128,10 +126,7 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="Ws2_32.lib olber32.lib oldap_r.lib" - LinkIncremental="1" AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\openldap\$(OutDir)"" - OptimizeReferences="2" - EnableCOMDATFolding="2" /> <Tool Name="VCALinkTool" Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.vcproj ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.vcproj (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.vcproj Thu Oct 18 14:11:43 2007 @@ -39,12 +39,7 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="0" AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\libdingaling\src"" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" UsePrecompiledHeader="0" /> <Tool @@ -112,8 +107,6 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\libdingaling\src"" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="2" UsePrecompiledHeader="0" /> <Tool @@ -129,8 +122,6 @@ Name="VCLinkerTool" AdditionalDependencies="Ws2_32.lib" AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\libdingaling\$(OutDir)";"$(InputDir)..\..\..\..\libs\iksemel\$(OutDir)"" - OptimizeReferences="2" - EnableCOMDATFolding="2" /> <Tool Name="VCALinkTool" Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.vcproj ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.vcproj (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.vcproj Thu Oct 18 14:11:43 2007 @@ -112,8 +112,6 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\iax\src"" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="2" UsePrecompiledHeader="0" DisableSpecificWarnings="4201" /> @@ -130,9 +128,6 @@ Name="VCLinkerTool" AdditionalDependencies="Ws2_32.lib Iphlpapi.lib Winmm.lib" AdditionalLibraryDirectories=""..\..\..\..\libs\iax\$(OutDir)"" - OptimizeReferences="2" - EnableCOMDATFolding="2" - LinkTimeCodeGeneration="1" /> <Tool Name="VCALinkTool" Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_PortAudio.vcproj ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_PortAudio.vcproj (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_PortAudio.vcproj Thu Oct 18 14:11:43 2007 @@ -112,8 +112,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\portaudio\include"" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;ALLOW_SMP_DANGERS" - RuntimeLibrary="2" + PreprocessorDefinitions="ALLOW_SMP_DANGERS" UsePrecompiledHeader="0" DisableSpecificWarnings="4100;4101" /> @@ -130,8 +129,6 @@ Name="VCLinkerTool" AdditionalDependencies="Ws2_32.lib Iphlpapi.lib Winmm.lib" AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\portaudio\winvc\Lib"" - OptimizeReferences="2" - EnableCOMDATFolding="2" /> <Tool Name="VCALinkTool" Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.vcproj ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.vcproj (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.vcproj Thu Oct 18 14:11:43 2007 @@ -39,12 +39,8 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="0" AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\su";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\nua";"$(InputDir)..\..\..\..\libs\sofia-sip\win32";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\url";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\sip";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\msg";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\sdp";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\nta";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\nea";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\soa";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\iptsec";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\bnf"" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;LIBSOFIA_SIP_UA_STATIC;PTW32_STATIC_LIB" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" + PreprocessorDefinitions="LIBSOFIA_SIP_UA_STATIC;PTW32_STATIC_LIB" UsePrecompiledHeader="0" DisableSpecificWarnings="4201" /> @@ -112,8 +108,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\su";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\nua";"$(InputDir)..\..\..\..\libs\sofia-sip\win32";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\url";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\sip";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\msg";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\sdp";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\nta";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\nea";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\soa";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\iptsec";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\bnf"" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;LIBSOFIA_SIP_UA_STATIC;PTW32_STATIC_LIB" - RuntimeLibrary="2" + PreprocessorDefinitions="LIBSOFIA_SIP_UA_STATIC;PTW32_STATIC_LIB" UsePrecompiledHeader="0" DisableSpecificWarnings="4201" /> @@ -130,9 +125,6 @@ Name="VCLinkerTool" AdditionalDependencies="ws2_32.lib advapi32.lib iphlpapi.lib" AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\sofia-sip\win32\pthread"" - OptimizeReferences="2" - EnableCOMDATFolding="2" - LinkTimeCodeGeneration="1" /> <Tool Name="VCALinkTool" Modified: freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.vcproj ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.vcproj (original) +++ freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.vcproj Thu Oct 18 14:11:43 2007 @@ -17,8 +17,6 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -40,17 +38,8 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include"" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" + AdditionalIncludeDirectories="" UsePrecompiledHeader="0" - WarningLevel="4" - WarnAsError="true" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -63,14 +52,7 @@ /> <Tool Name="VCLinkerTool" - OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" - LinkIncremental="1" - AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" - SubSystem="2" - ImportLibrary="$(OutDir)/mod_woomera.lib" - TargetMachine="1" + AdditionalLibraryDirectories="" /> <Tool Name="VCALinkTool" @@ -99,8 +81,6 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" @@ -122,14 +102,8 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include"" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="2" + AdditionalIncludeDirectories="" UsePrecompiledHeader="0" - WarningLevel="4" - WarnAsError="true" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -142,16 +116,7 @@ /> <Tool Name="VCLinkerTool" - OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" - LinkIncremental="1" - AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" - SubSystem="2" - OptimizeReferences="2" - EnableCOMDATFolding="2" - ImportLibrary="$(OutDir)/mod_woomera.lib" - TargetMachine="1" + AdditionalLibraryDirectories="" /> <Tool Name="VCALinkTool" Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.vcproj ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.vcproj (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.vcproj Thu Oct 18 14:11:43 2007 @@ -38,14 +38,8 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="0" AdditionalIncludeDirectories=""C:\Program Files\MySQL\MySQL Server 5.0\include"" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" UsePrecompiledHeader="0" - DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -58,8 +52,7 @@ /> <Tool Name="VCLinkerTool" - LinkIncremental="1" - AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)" + AdditionalLibraryDirectories="" /> <Tool Name="VCALinkTool" @@ -110,10 +103,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories=""C:\Program Files\MySQL\MySQL Server 5.0\include"" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="2" UsePrecompiledHeader="0" - DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -126,10 +116,7 @@ /> <Tool Name="VCLinkerTool" - LinkIncremental="1" - AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)" - OptimizeReferences="2" - EnableCOMDATFolding="2" + AdditionalLibraryDirectories="" /> <Tool Name="VCALinkTool" @@ -179,14 +166,8 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="0" AdditionalIncludeDirectories=""C:\Program Files\MySQL\MySQL Server 5.0\include"" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" UsePrecompiledHeader="0" - DebugInformationFormat="4" /> <Tool Name="VCManagedResourceCompilerTool" @@ -200,8 +181,7 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="mysqlclient.lib ws2_32.lib" - LinkIncremental="2" - AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\Debug;"C:\Program Files\MySQL\MySQL Server 5.0\lib\debug"" + AdditionalLibraryDirectories=""C:\Program Files\MySQL\MySQL Server 5.0\lib\debug"" /> <Tool Name="VCALinkTool" @@ -252,10 +232,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories=""C:\Program Files\MySQL\MySQL Server 5.0\include"" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="2" UsePrecompiledHeader="0" - DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -269,10 +246,7 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="mysqlclient.lib ws2_32.lib" - LinkIncremental="1" - AdditionalLibraryDirectories=""..\..\..\..\w32\vsnet\Release";"C:\Program Files\MySQL\MySQL Server 5.0\lib\opt"" - OptimizeReferences="2" - EnableCOMDATFolding="2" + AdditionalLibraryDirectories=""C:\Program Files\MySQL\MySQL Server 5.0\lib\opt"" /> <Tool Name="VCALinkTool" Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.vcproj ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.vcproj (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.vcproj Thu Oct 18 14:11:43 2007 @@ -38,12 +38,7 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="0" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" UsePrecompiledHeader="0" /> <Tool @@ -109,8 +104,6 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="2" UsePrecompiledHeader="0" /> <Tool @@ -126,8 +119,6 @@ Name="VCLinkerTool" AdditionalDependencies="ws2_32.lib" AdditionalLibraryDirectories="" - OptimizeReferences="2" - EnableCOMDATFolding="2" /> <Tool Name="VCALinkTool" Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.vcproj ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.vcproj (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.vcproj Thu Oct 18 14:11:43 2007 @@ -38,12 +38,7 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="0" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" UsePrecompiledHeader="0" /> <Tool @@ -108,8 +103,6 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="2" UsePrecompiledHeader="0" /> <Tool @@ -124,8 +117,6 @@ <Tool Name="VCLinkerTool" AdditionalLibraryDirectories="" - OptimizeReferences="2" - EnableCOMDATFolding="2" /> <Tool Name="VCALinkTool" Modified: freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.vcproj ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.vcproj (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.vcproj Thu Oct 18 14:11:43 2007 @@ -17,9 +17,8 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" > <Tool @@ -40,17 +39,8 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\howl-1.0.0\include"" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\howl-1.0.0\include"" UsePrecompiledHeader="0" - WarningLevel="4" - WarnAsError="true" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -64,14 +54,7 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="Ws2_32.lib iphlpapi.lib" - OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" - LinkIncremental="1" - AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\howl\src\lib\howl\Win32\$(OutDir)";"$(InputDir)..\..\..\..\libs\howl\src\lib\mDNSResponder\Win32\$(OutDir)";"..\..\..\..\w32\vsnet\$(OutDir)"" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" - SubSystem="2" - ImportLibrary="$(OutDir)/mod_zeroconf.lib" - TargetMachine="1" + AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\howl\src\lib\howl\Win32\$(OutDir)";"$(InputDir)..\..\..\..\libs\howl\src\lib\mDNSResponder\Win32\$(OutDir)"" /> <Tool Name="VCALinkTool" @@ -100,8 +83,6 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" @@ -124,14 +105,8 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\howl-1.0.0\include"" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="2" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\howl-1.0.0\include"" UsePrecompiledHeader="0" - WarningLevel="4" - WarnAsError="true" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -145,16 +120,7 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="Ws2_32.lib iphlpapi.lib" - OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" - LinkIncremental="1" - AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\howl\src\lib\howl\Win32\$(OutDir)";"$(InputDir)..\..\..\..\libs\howl\src\lib\mDNSResponder\Win32\$(OutDir)";"..\..\..\..\w32\vsnet\$(OutDir)"" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" - SubSystem="2" - OptimizeReferences="2" - EnableCOMDATFolding="2" - ImportLibrary="$(OutDir)/mod_zeroconf.lib" - TargetMachine="1" + AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\howl\src\lib\howl\Win32\$(OutDir)";"$(InputDir)..\..\..\..\libs\howl\src\lib\mDNSResponder\Win32\$(OutDir)"" /> <Tool Name="VCALinkTool" Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.vcproj ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.vcproj (original) +++ freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.vcproj Thu Oct 18 14:11:43 2007 @@ -110,8 +110,6 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="2" UsePrecompiledHeader="0" /> <Tool @@ -126,9 +124,6 @@ <Tool Name="VCLinkerTool" AdditionalLibraryDirectories="" - OptimizeReferences="2" - EnableCOMDATFolding="2" - LinkTimeCodeGeneration="1" /> <Tool Name="VCALinkTool" Modified: freeswitch/trunk/src/mod/formats/mod_native_file/mod_native_file.vcproj ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_native_file/mod_native_file.vcproj (original) +++ freeswitch/trunk/src/mod/formats/mod_native_file/mod_native_file.vcproj Thu Oct 18 14:11:43 2007 @@ -110,8 +110,6 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="2" UsePrecompiledHeader="0" /> <Tool @@ -126,9 +124,6 @@ <Tool Name="VCLinkerTool" AdditionalLibraryDirectories="" - OptimizeReferences="2" - EnableCOMDATFolding="2" - LinkTimeCodeGeneration="1" /> <Tool Name="VCALinkTool" Modified: freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.vcproj ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.vcproj (original) +++ freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.vcproj Thu Oct 18 14:11:43 2007 @@ -110,8 +110,6 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\win32\libsndfile\"" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="2" UsePrecompiledHeader="0" /> <Tool @@ -126,9 +124,6 @@ <Tool Name="VCLinkerTool" AdditionalLibraryDirectories=""..\..\..\..\libs\libsndfile\Win32\$(OutDir)"" - OptimizeReferences="2" - EnableCOMDATFolding="2" - LinkTimeCodeGeneration="1" /> <Tool Name="VCALinkTool" Modified: freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.vcproj ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.vcproj (original) +++ freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.vcproj Thu Oct 18 14:11:43 2007 @@ -112,8 +112,7 @@ Name="VCCLCompilerTool" AdditionalOptions="@compiler.opts" AdditionalIncludeDirectories="." - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;_CRT_SECURE_NO_DEPRECATE;MULTIPLICITY;EMBED_PERL" - RuntimeLibrary="2" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;MULTIPLICITY;EMBED_PERL" UsePrecompiledHeader="0" /> <Tool @@ -128,9 +127,6 @@ <Tool Name="VCLinkerTool" AdditionalLibraryDirectories="" - OptimizeReferences="2" - EnableCOMDATFolding="2" - LinkTimeCodeGeneration="1" /> <Tool Name="VCALinkTool" Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.vcproj ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.vcproj (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.vcproj Thu Oct 18 14:11:43 2007 @@ -17,8 +17,6 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -42,16 +40,9 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\js\src";"$(InputDir)..\..\..\..\libs\curl\include";"$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include"" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;XP_WIN;DEBUG;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE;SM_EXPORTS;JS_HAS_FILE_OBJECT=1" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\js\src";"$(InputDir)..\..\..\..\libs\curl\include";"$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include"" + PreprocessorDefinitions="XP_WIN;DEBUG;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE;SM_EXPORTS;JS_HAS_FILE_OBJECT=1" UsePrecompiledHeader="0" - WarningLevel="4" - WarnAsError="true" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -66,14 +57,7 @@ Name="VCLinkerTool" LinkLibraryDependencies="true" AdditionalDependencies="ws2_32.lib winmm.lib" - OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" - LinkIncremental="1" AdditionalLibraryDirectories=""..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib"" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" - SubSystem="2" - ImportLibrary="$(OutDir)/mod_spidermonkey.lib" - TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -102,8 +86,6 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" @@ -126,14 +108,9 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\js\src";"$(InputDir)..\..\..\..\libs\curl\include";"$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include"" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;XP_WIN;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE;SM_EXPORTS;JS_HAS_FILE_OBJECT=1" - RuntimeLibrary="2" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\js\src";"$(InputDir)..\..\..\..\libs\curl\include";"$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include"" + PreprocessorDefinitions="XP_WIN;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE;SM_EXPORTS;JS_HAS_FILE_OBJECT=1" UsePrecompiledHeader="0" - WarningLevel="4" - WarnAsError="true" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -148,17 +125,7 @@ Name="VCLinkerTool" LinkLibraryDependencies="true" AdditionalDependencies="ws2_32.lib winmm.lib" - OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" - LinkIncremental="1" AdditionalLibraryDirectories=""..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib"" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" - SubSystem="2" - OptimizeReferences="2" - EnableCOMDATFolding="2" - LinkTimeCodeGeneration="1" - ImportLibrary="$(OutDir)/mod_spidermonkey.lib" - TargetMachine="1" /> <Tool Name="VCALinkTool" Modified: freeswitch/trunk/src/mod/loggers/mod_console/mod_console.vcproj ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_console/mod_console.vcproj (original) +++ freeswitch/trunk/src/mod/loggers/mod_console/mod_console.vcproj Thu Oct 18 14:11:43 2007 @@ -38,12 +38,7 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="0" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" UsePrecompiledHeader="0" /> <Tool @@ -108,8 +103,6 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="2" UsePrecompiledHeader="0" /> <Tool @@ -124,8 +117,6 @@ <Tool Name="VCLinkerTool" AdditionalLibraryDirectories="" - OptimizeReferences="2" - EnableCOMDATFolding="2" /> <Tool Name="VCALinkTool" Modified: freeswitch/trunk/src/mod/say/mod_say_de/mod_say_de.vcproj ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_de/mod_say_de.vcproj (original) +++ freeswitch/trunk/src/mod/say/mod_say_de/mod_say_de.vcproj Thu Oct 18 14:11:43 2007 @@ -108,8 +108,6 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="2" UsePrecompiledHeader="0" /> <Tool @@ -124,8 +122,6 @@ <Tool Name="VCLinkerTool" AdditionalLibraryDirectories="" - OptimizeReferences="2" - EnableCOMDATFolding="2" /> <Tool Name="VCALinkTool" Modified: freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.vcproj ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.vcproj (original) +++ freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.vcproj Thu Oct 18 14:11:43 2007 @@ -108,8 +108,6 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="2" UsePrecompiledHeader="0" /> <Tool @@ -124,8 +122,6 @@ <Tool Name="VCLinkerTool" AdditionalLibraryDirectories="" - OptimizeReferences="2" - EnableCOMDATFolding="2" /> <Tool Name="VCALinkTool" Modified: freeswitch/trunk/src/mod/say/mod_say_es/mod_say_es.vcproj ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_es/mod_say_es.vcproj (original) +++ freeswitch/trunk/src/mod/say/mod_say_es/mod_say_es.vcproj Thu Oct 18 14:11:43 2007 @@ -108,7 +108,6 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" RuntimeLibrary="2" UsePrecompiledHeader="0" /> @@ -124,8 +123,6 @@ <Tool Name="VCLinkerTool" AdditionalLibraryDirectories="" - OptimizeReferences="2" - EnableCOMDATFolding="2" /> <Tool Name="VCALinkTool" Modified: freeswitch/trunk/src/mod/say/mod_say_fr/mod_say_fr.vcproj ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_fr/mod_say_fr.vcproj (original) +++ freeswitch/trunk/src/mod/say/mod_say_fr/mod_say_fr.vcproj Thu Oct 18 14:11:43 2007 @@ -108,8 +108,6 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="2" UsePrecompiledHeader="0" /> <Tool @@ -124,8 +122,6 @@ <Tool Name="VCLinkerTool" AdditionalLibraryDirectories="" - OptimizeReferences="2" - EnableCOMDATFolding="2" /> <Tool Name="VCALinkTool" Modified: freeswitch/trunk/src/mod/say/mod_say_it/mod_say_it.vcproj ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_it/mod_say_it.vcproj (original) +++ freeswitch/trunk/src/mod/say/mod_say_it/mod_say_it.vcproj Thu Oct 18 14:11:43 2007 @@ -108,8 +108,6 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="2" UsePrecompiledHeader="0" /> <Tool @@ -124,8 +122,6 @@ <Tool Name="VCLinkerTool" AdditionalLibraryDirectories="" - OptimizeReferences="2" - EnableCOMDATFolding="2" /> <Tool Name="VCALinkTool" Modified: freeswitch/trunk/src/mod/say/mod_say_nl/mod_say_nl.vcproj ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_nl/mod_say_nl.vcproj (original) +++ freeswitch/trunk/src/mod/say/mod_say_nl/mod_say_nl.vcproj Thu Oct 18 14:11:43 2007 @@ -108,8 +108,6 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="2" UsePrecompiledHeader="0" /> <Tool @@ -124,8 +122,6 @@ <Tool Name="VCLinkerTool" AdditionalLibraryDirectories="" - OptimizeReferences="2" - EnableCOMDATFolding="2" /> <Tool Name="VCALinkTool" Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.vcproj ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.vcproj (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.vcproj Thu Oct 18 14:11:43 2007 @@ -17,8 +17,6 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -40,17 +38,9 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\curl\include"" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;CURL_STATICLIB" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\curl\include"" + PreprocessorDefinitions="CURL_STATICLIB" UsePrecompiledHeader="0" - WarningLevel="4" - WarnAsError="true" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -64,14 +54,7 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="Ws2_32.lib Winmm.lib" - OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" - LinkIncremental="1" - AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" - SubSystem="2" - ImportLibrary="$(OutDir)/mod_xml_cdr.lib" - TargetMachine="1" + AdditionalLibraryDirectories="" /> <Tool Name="VCALinkTool" @@ -100,8 +83,6 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" @@ -123,14 +104,9 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\curl\include"" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;CURL_STATICLIB" - RuntimeLibrary="2" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\curl\include"" + PreprocessorDefinitions="CURL_STATICLIB" UsePrecompiledHeader="0" - WarningLevel="4" - WarnAsError="true" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -144,16 +120,7 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="Ws2_32.lib Winmm.lib" - OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" - LinkIncremental="1" - AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" - SubSystem="2" - OptimizeReferences="2" - EnableCOMDATFolding="2" - ImportLibrary="$(OutDir)/mod_xml_cdr.lib" - TargetMachine="1" + AdditionalLibraryDirectories="" /> <Tool Name="VCALinkTool" Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.vcproj ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.vcproj (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.vcproj Thu Oct 18 14:11:43 2007 @@ -17,8 +17,6 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -41,17 +39,9 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c";"$(InputDir)..\..\..\..\libs\curl\include"" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;ABYSS_WIN32;CURL_STATICLIB" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\xmlrpc-c\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c";"$(InputDir)..\..\..\..\libs\curl\include"" + PreprocessorDefinitions="ABYSS_WIN32;CURL_STATICLIB" UsePrecompiledHeader="0" - WarningLevel="4" - WarnAsError="true" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -65,14 +55,7 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="Winmm.lib Ws2_32.lib" - OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" - LinkIncremental="1" - AdditionalLibraryDirectories=""..\..\..\..\w32\vsnet\$(OutDir)";..\..\..\..\libs\xmlcurl\lib;"..\..\..\..\libs\xmlcurl\lib\abyss\src\$(OutDir)";"..\..\..\..\libs\apr-util\xml\expat\lib\LibD"" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" - SubSystem="2" - ImportLibrary="$(OutDir)/mod_xml_curl.lib" - TargetMachine="1" + AdditionalLibraryDirectories="..\..\..\..\libs\xmlcurl\lib;"..\..\..\..\libs\xmlcurl\lib\abyss\src\$(OutDir)";"..\..\..\..\libs\apr-util\xml\expat\lib\LibD"" /> <Tool Name="VCALinkTool" @@ -101,8 +84,6 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" @@ -125,14 +106,9 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c";"$(InputDir)..\..\..\..\libs\curl\include"" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;ABYSS_WIN32;CURL_STATICLIB" - RuntimeLibrary="2" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\xmlrpc-c\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c";"$(InputDir)..\..\..\..\libs\curl\include"" + PreprocessorDefinitions="CURL_STATICLIB" UsePrecompiledHeader="0" - WarningLevel="4" - WarnAsError="true" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -146,16 +122,7 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="Winmm.lib Ws2_32.lib" - OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" - LinkIncremental="1" - AdditionalLibraryDirectories=""..\..\..\..\w32\vsnet\$(OutDir)";..\..\..\..\libs\xmlcurl\lib;"..\..\..\..\libs\xmlcurl\lib\abyss\src\$(OutDir)";"..\..\..\..\libs\apr-util\xml\expat\lib\LibR"" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" - SubSystem="2" - OptimizeReferences="2" - EnableCOMDATFolding="2" - ImportLibrary="$(OutDir)/mod_xml_curl.lib" - TargetMachine="1" + AdditionalLibraryDirectories="..\..\..\..\libs\xmlcurl\lib;"..\..\..\..\libs\xmlcurl\lib\abyss\src\$(OutDir)";"..\..\..\..\libs\apr-util\xml\expat\lib\LibR"" /> <Tool Name="VCALinkTool" Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj Thu Oct 18 14:11:43 2007 @@ -17,8 +17,6 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -41,17 +39,9 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c";"$(InputDir)..\..\..\..\libs\curl\include"" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;ABYSS_WIN32;CURL_STATICLIB" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\xmlrpc-c\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c";"$(InputDir)..\..\..\..\libs\curl\include"" + PreprocessorDefinitions="ABYSS_WIN32;CURL_STATICLIB" UsePrecompiledHeader="0" - WarningLevel="4" - WarnAsError="true" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -65,14 +55,7 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="Winmm.lib Ws2_32.lib" - OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" - LinkIncremental="1" - AdditionalLibraryDirectories=""..\..\..\..\w32\vsnet\$(OutDir)";..\..\..\..\libs\xmlrpc\lib;"..\..\..\..\libs\xmlrpc\lib\abyss\src\$(OutDir)";"..\..\..\..\libs\apr-util\xml\expat\lib\LibD"" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" - SubSystem="2" - ImportLibrary="$(OutDir)/mod_xml_rpc.lib" - TargetMachine="1" + AdditionalLibraryDirectories="..\..\..\..\libs\xmlrpc\lib;"..\..\..\..\libs\xmlrpc\lib\abyss\src\$(OutDir)";"..\..\..\..\libs\apr-util\xml\expat\lib\LibD"" /> <Tool Name="VCALinkTool" @@ -101,8 +84,6 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" @@ -125,14 +106,9 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c";"$(InputDir)..\..\..\..\libs\curl\include"" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;ABYSS_WIN32;CURL_STATICLIB" - RuntimeLibrary="2" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\xmlrpc-c\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c";"$(InputDir)..\..\..\..\libs\curl\include"" + PreprocessorDefinitions="ABYSS_WIN32;CURL_STATICLIB" UsePrecompiledHeader="0" - WarningLevel="4" - WarnAsError="true" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -146,16 +122,7 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="Winmm.lib Ws2_32.lib" - OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" - LinkIncremental="1" - AdditionalLibraryDirectories=""..\..\..\..\w32\vsnet\$(OutDir)";..\..\..\..\libs\xmlrpc\lib;"..\..\..\..\libs\xmlrpc\lib\abyss\src\$(OutDir)";"..\..\..\..\libs\apr-util\xml\expat\lib\LibR"" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" - SubSystem="2" - OptimizeReferences="2" - EnableCOMDATFolding="2" - ImportLibrary="$(OutDir)/mod_xml_rpc.lib" - TargetMachine="1" + AdditionalLibraryDirectories="..\..\..\..\libs\xmlrpc\lib;"..\..\..\..\libs\xmlrpc\lib\abyss\src\$(OutDir)";"..\..\..\..\libs\apr-util\xml\expat\lib\LibR"" /> <Tool Name="VCALinkTool" Modified: freeswitch/trunk/w32/module_debug.vsprops ============================================================================== --- freeswitch/trunk/w32/module_debug.vsprops (original) +++ freeswitch/trunk/w32/module_debug.vsprops Thu Oct 18 14:11:43 2007 @@ -15,6 +15,7 @@ /> <Tool Name="VCLinkerTool" + OutputFile="$(SolutionDir)Debug/mod/$(InputName).dll" LinkIncremental="1" /> </VisualStudioPropertySheet> Modified: freeswitch/trunk/w32/module_release.vsprops ============================================================================== --- freeswitch/trunk/w32/module_release.vsprops (original) +++ freeswitch/trunk/w32/module_release.vsprops Thu Oct 18 14:11:43 2007 @@ -13,6 +13,7 @@ /> <Tool Name="VCLinkerTool" + OutputFile="$(SolutionDir)Release/mod/$(InputName).dll" LinkIncremental="1" OptimizeReferences="2" EnableCOMDATFolding="2" Modified: freeswitch/trunk/w32/modules.vsprops ============================================================================== --- freeswitch/trunk/w32/modules.vsprops (original) +++ freeswitch/trunk/w32/modules.vsprops Thu Oct 18 14:11:43 2007 @@ -16,7 +16,7 @@ /> <Tool Name="VCLinkerTool" - OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" + OutputFile="" GenerateDebugInformation="true" ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" ImportLibrary="$(OutDir)/$(InputName).lib"

1 0

[commit] r5970 - in freeswitch/trunk/src/mod: codecs/mod_g722 endpoints/mod_sofia
by Freeswitch SVN 18 Oct '07

18 Oct '07

Author: anthm Date: Thu Oct 18 12:58:01 2007 New Revision: 5970 Modified: freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: stupid g722 Modified: freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.c Thu Oct 18 12:58:01 2007 @@ -135,7 +135,7 @@ /*.init */ switch_g722_init, /*.encode */ switch_g722_encode, /*.decode */ switch_g722_decode, - /*.destroy */ switch_g722_destroy, + /*.destroy */ switch_g722_destroy }; static switch_codec_implementation_t g722_16k_implementation = { Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Thu Oct 18 12:58:01 2007 @@ -1307,7 +1307,11 @@ if ((tech_pvt->rm_encoding = switch_core_session_strdup(session, (char *) rm_encoding))) { char tmp[50]; tech_pvt->pt = (switch_payload_t) map->rm_pt; - tech_pvt->rm_rate = map->rm_rate; + if (map->rm_pt == 9) { + tech_pvt->rm_rate = 16000; /* *stab* *stab* *stab* */ + } else { + tech_pvt->rm_rate = map->rm_rate; + } tech_pvt->codec_ms = mimp->microseconds_per_frame / 1000; tech_pvt->remote_sdp_audio_ip = switch_core_session_strdup(session, (char *) connection->c_address); tech_pvt->rm_fmtp = switch_core_session_strdup(session, (char *) map->rm_fmtp);

1 0

[commit] r5969 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 18 Oct '07

18 Oct '07

Author: anthm Date: Thu Oct 18 12:44:11 2007 New Revision: 5969 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: stupid g722 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Thu Oct 18 12:44:11 2007 @@ -87,7 +87,7 @@ snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %d", tech_pvt->pt); } else if (tech_pvt->num_codecs) { int i; - int already_did[256] = { 0 }; + int already_did[128] = { 0 }; for (i = 0; i < tech_pvt->num_codecs; i++) { const switch_codec_implementation_t *imp = tech_pvt->codecs[i]; @@ -95,11 +95,13 @@ continue; } - if (already_did[imp->ianacode]) { - continue; - } + if (imp->ianacode < 128) { + if (already_did[imp->ianacode]) { + continue; + } - already_did[imp->ianacode] = 1; + already_did[imp->ianacode] = 1; + } snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %d", imp->ianacode); if (!ptime) { @@ -133,7 +135,7 @@ } else if (tech_pvt->num_codecs) { int i; - int already_did[256] = { 0 }; + int already_did[128] = { 0 }; for (i = 0; i < tech_pvt->num_codecs; i++) { const switch_codec_implementation_t *imp = tech_pvt->codecs[i]; @@ -141,11 +143,13 @@ continue; } - if (already_did[imp->ianacode]) { - continue; + if (imp->ianacode < 128) { + if (already_did[imp->ianacode]) { + continue; + } + + already_did[imp->ianacode] = 1; } - - already_did[imp->ianacode] = 1; rate = imp->samples_per_second; @@ -189,7 +193,7 @@ snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %d", tech_pvt->video_pt); } else if (tech_pvt->num_codecs) { int i; - int already_did[256] = { 0 }; + int already_did[128] = { 0 }; for (i = 0; i < tech_pvt->num_codecs; i++) { const switch_codec_implementation_t *imp = tech_pvt->codecs[i]; @@ -197,12 +201,14 @@ continue; } - if (already_did[imp->ianacode]) { - continue; - } - - already_did[imp->ianacode] = 1; + if (imp->ianacode < 128) { + if (already_did[imp->ianacode]) { + continue; + } + already_did[imp->ianacode] = 1; + } + snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %d", imp->ianacode); if (!ptime) { ptime = imp->microseconds_per_frame / 1000; @@ -220,7 +226,7 @@ } } else if (tech_pvt->num_codecs) { int i; - int already_did[256] = { 0 }; + int already_did[128] = { 0 }; for (i = 0; i < tech_pvt->num_codecs; i++) { const switch_codec_implementation_t *imp = tech_pvt->codecs[i]; @@ -228,12 +234,14 @@ continue; } - if (already_did[imp->ianacode]) { - continue; + if (imp->ianacode < 128) { + if (already_did[imp->ianacode]) { + continue; + } + + already_did[imp->ianacode] = 1; } - already_did[imp->ianacode] = 1; - if (!rate) { rate = imp->samples_per_second; } @@ -1242,7 +1250,11 @@ if (imp->codec_type != SWITCH_CODEC_TYPE_AUDIO) { continue; } - + + if (imp->ianacode == 9) { + codec_rate = 8000; + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Audio Codec Compare [%s:%d:%u]/[%s:%d:%u]\n", rm_encoding, map->rm_pt, (int)map->rm_rate, imp->iananame, imp->ianacode, codec_rate); if (map->rm_pt < 96) {

1 0

[commit] r5968 - in freeswitch/trunk/src/mod: codecs/mod_g722 endpoints/mod_sofia
by Freeswitch SVN 18 Oct '07

18 Oct '07

Author: anthm Date: Thu Oct 18 12:32:32 2007 New Revision: 5968 Modified: freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: stupid g722 Modified: freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.c Thu Oct 18 12:32:32 2007 @@ -143,7 +143,7 @@ /*.ianacode */ 9, /*.iananame */ "G722", /*.fmtp */ NULL, - /*.samples_per_second */ 8000, + /*.samples_per_second */ 16000, /*.bits_per_second */ 64000, /*.microseconds_per_frame */ 20000, /*.samples_per_frame */ 160, Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Thu Oct 18 12:32:32 2007 @@ -87,12 +87,19 @@ snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %d", tech_pvt->pt); } else if (tech_pvt->num_codecs) { int i; + int already_did[256] = { 0 }; for (i = 0; i < tech_pvt->num_codecs; i++) { const switch_codec_implementation_t *imp = tech_pvt->codecs[i]; if (imp->codec_type != SWITCH_CODEC_TYPE_AUDIO) { continue; } + + if (already_did[imp->ianacode]) { + continue; + } + + already_did[imp->ianacode] = 1; snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %d", imp->ianacode); if (!ptime) { @@ -113,6 +120,9 @@ if (tech_pvt->rm_encoding) { rate = tech_pvt->rm_rate; + if (tech_pvt->pt == 9) { + rate = 8000; + } snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d %s/%d\n", tech_pvt->pt, tech_pvt->rm_encoding, rate); if (tech_pvt->fmtp_out) { snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=fmtp:%d %s\n", tech_pvt->pt, tech_pvt->fmtp_out); @@ -123,6 +133,7 @@ } else if (tech_pvt->num_codecs) { int i; + int already_did[256] = { 0 }; for (i = 0; i < tech_pvt->num_codecs; i++) { const switch_codec_implementation_t *imp = tech_pvt->codecs[i]; @@ -130,12 +141,20 @@ continue; } + if (already_did[imp->ianacode]) { + continue; + } + + already_did[imp->ianacode] = 1; + rate = imp->samples_per_second; if (ptime && ptime != imp->microseconds_per_frame / 1000) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "ptime %u != advertised ptime %u\n", imp->microseconds_per_frame / 1000, ptime); } - + if (imp->ianacode == 9) { + rate = 8000; + } snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d %s/%d\n", imp->ianacode, imp->iananame, rate); if (imp->fmtp) { snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=fmtp:%d %s\n", imp->ianacode, imp->fmtp); @@ -170,6 +189,7 @@ snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %d", tech_pvt->video_pt); } else if (tech_pvt->num_codecs) { int i; + int already_did[256] = { 0 }; for (i = 0; i < tech_pvt->num_codecs; i++) { const switch_codec_implementation_t *imp = tech_pvt->codecs[i]; @@ -177,6 +197,12 @@ continue; } + if (already_did[imp->ianacode]) { + continue; + } + + already_did[imp->ianacode] = 1; + snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %d", imp->ianacode); if (!ptime) { ptime = imp->microseconds_per_frame / 1000; @@ -194,6 +220,7 @@ } } else if (tech_pvt->num_codecs) { int i; + int already_did[256] = { 0 }; for (i = 0; i < tech_pvt->num_codecs; i++) { const switch_codec_implementation_t *imp = tech_pvt->codecs[i]; @@ -201,6 +228,12 @@ continue; } + if (already_did[imp->ianacode]) { + continue; + } + + already_did[imp->ianacode] = 1; + if (!rate) { rate = imp->samples_per_second; }

1 0

[commit] r5967 - in freeswitch/trunk: conf src src/include src/mod/applications/mod_voicemail src/mod/endpoints/mod_dingaling src/mod/endpoints/mod_sofia
by Freeswitch SVN 18 Oct '07

18 Oct '07

Author: anthm Date: Thu Oct 18 12:17:42 2007 New Revision: 5967 Modified: freeswitch/trunk/conf/directory.xml freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c freeswitch/trunk/src/switch_core_db.c Log: improvements Modified: freeswitch/trunk/conf/directory.xml ============================================================================== --- freeswitch/trunk/conf/directory.xml (original) +++ freeswitch/trunk/conf/directory.xml Thu Oct 18 12:17:42 2007 @@ -45,7 +45,9 @@ <variables>  <variable name="testing" value="this"/> -  +  +  +  </variables> <vcard> Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Thu Oct 18 12:17:42 2007 @@ -1077,9 +1077,10 @@ \brief perform a test query then perform a reactive query if the first one fails \param db the db handle \param test_sql the test sql + \param drop_sql the drop sql \param reactive_sql the reactive sql */ -SWITCH_DECLARE(void) switch_core_db_test_reactive(switch_core_db_t *db, char *test_sql, char *reactive_sql); +SWITCH_DECLARE(void) switch_core_db_test_reactive(switch_core_db_t *db, char *test_sql, char *drop_sql, char *reactive_sql); #define SWITCH_CORE_DB "core" /*! Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Thu Oct 18 12:17:42 2007 @@ -404,8 +404,8 @@ } else { #endif if ((db = switch_core_db_open_file(profile->dbname))) { - switch_core_db_test_reactive(db, "select * from voicemail_data", vm_sql); - switch_core_db_test_reactive(db, "select * from voicemail_prefs", vm_pref_sql); + switch_core_db_test_reactive(db, "select * from voicemail_data", NULL, vm_sql); + switch_core_db_test_reactive(db, "select * from voicemail_prefs", NULL, vm_pref_sql); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot Open SQL Database!\n"); continue; Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Thu Oct 18 12:17:42 2007 @@ -2213,7 +2213,7 @@ } else { #endif if ((db = switch_core_db_open_file(profile->dbname))) { - switch_core_db_test_reactive(db, "select * from jabber_subscriptions", sub_sql); + switch_core_db_test_reactive(db, "select * from jabber_subscriptions", NULL, sub_sql); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot Open SQL Database!\n"); continue; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Thu Oct 18 12:17:42 2007 @@ -257,12 +257,11 @@ char *contact_str = switch_event_get_header(event, "orig-contact"); char *exp_str = switch_event_get_header(event, "orig-expires"); char *rpid = switch_event_get_header(event, "orig-rpid"); + char *call_id = switch_event_get_header(event, "orig-call-id"); long expires = (long) time(NULL) + atol(exp_str); char *profile_name = switch_event_get_header(event, "orig-profile-name"); sofia_profile_t *profile = NULL; - char *icontact = NULL, *p; - - + if (!rpid) { rpid = "unknown"; } @@ -272,13 +271,7 @@ return; } if (sofia_test_pflag(profile, PFLAG_MULTIREG)) { - icontact = sofia_glue_get_url_from_contact(contact_str, 1); - - if ((p = strchr(icontact, ';'))) { - *p = '\0'; - } - sql = switch_mprintf("delete from sip_registrations where user='%q' and host='%q' and contact like '%%%q%%'", from_user, from_host, icontact); - switch_safe_free(icontact); + sql = switch_mprintf("delete from sip_registrations where call_id='%q'", call_id); } else { sql = switch_mprintf("delete from sip_registrations where user='%q' and host='%q'", from_user, from_host); } @@ -287,8 +280,8 @@ sofia_glue_execute_sql(profile, SWITCH_FALSE, sql, NULL); switch_safe_free(sql); - sql = switch_mprintf("insert into sip_registrations values ('%q','%q','%q','Regestered', '%q', %ld)", - from_user, from_host, contact_str, rpid, expires); + sql = switch_mprintf("insert into sip_registrations values ('%q', '%q','%q','%q','Regestered', '%q', %ld)", + call_id, from_user, from_host, contact_str, rpid, expires); if (sql) { sofia_glue_execute_sql(profile, SWITCH_FALSE, sql, NULL); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Thu Oct 18 12:17:42 2007 @@ -1550,6 +1550,7 @@ char reg_sql[] = "CREATE TABLE sip_registrations (\n" + " call_id VARCHAR(255),\n" " user VARCHAR(255),\n" " host VARCHAR(255),\n" " contact VARCHAR(1024),\n" @@ -1591,18 +1592,29 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Connected ODBC DSN: %s\n", profile->odbc_dsn); - switch_odbc_handle_exec(profile->master_odbc, reg_sql, NULL); - switch_odbc_handle_exec(profile->master_odbc, sub_sql, NULL); - switch_odbc_handle_exec(profile->master_odbc, auth_sql, NULL); + if (switch_odbc_handle_exec(profile->master_odbc, "select call_id from sip_registrations", NULL) != SWITCH_ODBC_SUCCESS) { + switch_odbc_handle_exec(profile->master_odbc, "DROP TABLE sip_registrations", NULL); + switch_odbc_handle_exec(profile->master_odbc, reg_sql, NULL); + } + + if (switch_odbc_handle_exec(profile->master_odbc, "select contact from sip_subscriptions", NULL) != SWITCH_ODBC_SUCCESS) { + switch_odbc_handle_exec(profile->master_odbc, "DROP TABLE sip_subscriptions", NULL); + switch_odbc_handle_exec(profile->master_odbc, sub_sql, NULL); + } + + if (switch_odbc_handle_exec(profile->master_odbc, "select nonce from sip_authentication", NULL) != SWITCH_ODBC_SUCCESS) { + switch_odbc_handle_exec(profile->master_odbc, "DROP TABLE sip_authentication", NULL); + switch_odbc_handle_exec(profile->master_odbc, auth_sql, NULL); + } } else { #endif if (!(profile->master_db = switch_core_db_open_file(profile->dbname))) { return 0; } - switch_core_db_test_reactive(profile->master_db, "select contact from sip_registrations", reg_sql); - switch_core_db_test_reactive(profile->master_db, "select contact from sip_subscriptions", sub_sql); - switch_core_db_test_reactive(profile->master_db, "select * from sip_authentication", auth_sql); + switch_core_db_test_reactive(profile->master_db, "select call_id from sip_registrations", "DROP TABLE sip_registrations", reg_sql); + switch_core_db_test_reactive(profile->master_db, "select contact from sip_subscriptions", "DROP TABLE sip_subscriptions", sub_sql); + switch_core_db_test_reactive(profile->master_db, "select * from sip_authentication", "DROP TABLE sip_authentication", auth_sql); #ifdef SWITCH_HAVE_ODBC } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Thu Oct 18 12:17:42 2007 @@ -340,6 +340,7 @@ char *register_gateway = NULL; int network_port; int cd = 0; + char *call_id = NULL; /* all callers must confirm that sip, sip->sip_request and sip->sip_contact are not NULL */ assert(sip != NULL && sip->sip_contact != NULL && sip->sip_request != NULL); @@ -412,9 +413,11 @@ } if (v_event && *v_event) { - register_gateway = switch_event_get_header(*v_event, "register-gateway"); - - if ((v_contact_str = switch_event_get_header(*v_event, "force-contact"))) { + char *exp_var; + + register_gateway = switch_event_get_header(*v_event, "sip-register-gateway"); + + if ((v_contact_str = switch_event_get_header(*v_event, "sip-force-contact"))) { if (!strcasecmp(v_contact_str, "nat-connectile-dysfunction") || !strcasecmp(v_contact_str, "NDLB-connectile-dysfunction")) { if (contact->m_url->url_params) { snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%d;%s>", @@ -423,6 +426,7 @@ snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%d>", display, contact->m_url->url_user, network_ip, network_port); } cd = 1; + exptime = 20; } else { char *p; switch_copy_string(contact_str, v_contact_str, sizeof(contact_str)); @@ -433,6 +437,13 @@ } } } + + if ((exp_var = switch_event_get_header(*v_event, "sip-force-expires"))) { + int tmp = atoi(exp_var); + if (tmp > 0) { + exptime = tmp; + } + } } if (auth_res != AUTH_OK && !stale) { @@ -459,25 +470,23 @@ if (regtype != REG_REGISTER) { return 0; } + + call_id = sip_header_as_string(profile->home, (void *) sip->sip_call_id); + assert(call_id); + if (exptime) { - + if (sofia_test_pflag(profile, PFLAG_MULTIREG)) { - char *icontact, *p; - icontact = sofia_glue_get_url_from_contact(contact_str, 1); - if ((p = strchr(icontact, ';'))) { - *p = '\0'; - } - - sql = switch_mprintf("delete from sip_registrations where user='%q' and host='%q' and contact like '%%%q%%'", to_user, to_host, icontact); - switch_safe_free(icontact); + sql = switch_mprintf("delete from sip_registrations where call_id='%q'", call_id); } else { sql = switch_mprintf("delete from sip_registrations where user='%q' and host='%q'", to_user, to_host); } switch_mutex_lock(profile->ireg_mutex); sofia_glue_execute_sql(profile, SWITCH_FALSE, sql, NULL); switch_safe_free(sql); - sql = switch_mprintf("insert into sip_registrations values ('%q','%q','%q','%q', '%q', %ld)", + + sql = switch_mprintf("insert into sip_registrations values ('%q', '%q','%q','%q','%q', '%q', %ld)", call_id, to_user, to_host, contact_str, cd ? "Registered(NATHACK)" : "Registered", rpid, (long) time(NULL) + (long) exptime * 2); @@ -493,6 +502,7 @@ switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "from-user", "%s", to_user); switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "from-host", "%s", to_host); switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "contact", "%s", contact_str); + switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "call-id", "%s", call_id); switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "rpid", "%s", rpid); switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "expires", "%ld", (long) exptime); switch_event_fire(&s_event); @@ -509,7 +519,6 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", profile->url); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "rpid", "%s", rpid); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s@%s", to_user, to_host); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "status", "Registered"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_type", "presence"); switch_event_fire(&event); @@ -521,13 +530,16 @@ if ((p = strchr(icontact, ';'))) { *p = '\0'; } + if ((p = strchr(icontact + 4, ':'))) { + *p = '\0'; + } if ((sql = switch_mprintf("delete from sip_subscriptions where user='%q' and host='%q' and contact like '%%%q%%'", to_user, to_host, icontact))) { sofia_glue_execute_sql(profile, SWITCH_FALSE, sql, profile->ireg_mutex); switch_safe_free(sql); sql = NULL; } - if ((sql = switch_mprintf("delete from sip_registrations where user='%q' and host='%q' and contact like '%%%q%%'", to_user, to_host, icontact))) { + if ((sql = switch_mprintf("delete from sip_registrations where call_id='%q'", to_user, to_host, call_id))) { sofia_glue_execute_sql(profile, SWITCH_FALSE, sql, profile->ireg_mutex); switch_safe_free(sql); sql = NULL; @@ -565,8 +577,21 @@ switch_event_fire(&event); } + + if (call_id) { + su_free(profile->home, call_id); + } + if (regtype == REG_REGISTER) { - nua_respond(nh, SIP_200_OK, SIPTAG_CONTACT(contact), NUTAG_WITH_THIS(nua), TAG_END()); + char *new_contact = NULL; + if (exptime) { + new_contact = switch_mprintf("%s;expires=%ld", contact_str, (long)exptime); + nua_respond(nh, SIP_200_OK, SIPTAG_CONTACT_STR(new_contact), NUTAG_WITH_THIS(nua), TAG_END()); + switch_safe_free(new_contact); + } else { + nua_respond(nh, SIP_200_OK, SIPTAG_CONTACT(contact), NUTAG_WITH_THIS(nua), TAG_END()); + } + return 1; } Modified: freeswitch/trunk/src/switch_core_db.c ============================================================================== --- freeswitch/trunk/src/switch_core_db.c (original) +++ freeswitch/trunk/src/switch_core_db.c Thu Oct 18 12:17:42 2007 @@ -171,7 +171,7 @@ } -SWITCH_DECLARE(void) switch_core_db_test_reactive(switch_core_db_t *db, char *test_sql, char *reactive_sql) +SWITCH_DECLARE(void) switch_core_db_test_reactive(switch_core_db_t *db, char *test_sql, char *drop_sql, char *reactive_sql) { char *errmsg; @@ -183,6 +183,14 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SQL ERR [%s]\n[%s]\nAuto Generating Table!\n", errmsg, test_sql); switch_core_db_free(errmsg); errmsg = NULL; + if (drop_sql) { + switch_core_db_exec(db, drop_sql, NULL, NULL, &errmsg); + } + if (errmsg) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SQL ERR [%s]\n[%s]\n", errmsg, reactive_sql); + switch_core_db_free(errmsg); + errmsg = NULL; + } switch_core_db_exec(db, reactive_sql, NULL, NULL, &errmsg); if (errmsg) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SQL ERR [%s]\n[%s]\n", errmsg, reactive_sql);

1 0