From bbffdd99ab8dae86cb3b7c1404ce66767ca4a204 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Thu, 18 Oct 2007 04:15:33 +0000 Subject: [PATCH] cleanup some project file properties and hopefully fix the release build enum issue. git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5961 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- Freeswitch.sln | 2 +- libs/portaudio/build/msvc/portaudio.vcproj | 4 - libs/win32/Download HOWL.vcproj | 2 - libs/win32/Download PTHREAD.vcproj | 2 - libs/win32/apr-iconv/libapriconv.vcproj | 2 - libs/win32/apr-util/libaprutil.vcproj | 2 - libs/win32/apr-util/xml.vcproj | 2 - libs/win32/apr/libapr.vcproj | 2 - libs/win32/curl/curllib.vcproj | 2 - libs/win32/etpan/libetpan.vcproj | 2 - libs/win32/howl/libhowl.vcproj | 2 - libs/win32/howl/libmDNSResponder.vcproj | 2 - libs/win32/js/js.vcproj | 198 ------------------ libs/win32/libresample/libresample.vcproj | 2 - libs/win32/pcre/libpcre.vcproj | 4 - libs/win32/pthread/pthread.vcproj | 4 - .../win32/sofia/libsofia_sip_ua_static.vcproj | 2 - libs/win32/speex/libspeex.vcproj | 2 - libs/win32/sqlite/sqlite.vcproj | 4 - libs/win32/udns/libudns.vcproj | 4 +- libs/win32/xmlrpc/Abyss.vcproj | 2 - libs/win32/xmlrpc/xmlrpc.vcproj | 2 - .../mod_commands/mod_commands.vcproj | 2 - .../mod_conference/mod_conference.vcproj | 2 - .../mod_dptools/mod_dptools.vcproj | 2 - src/mod/applications/mod_enum/mod_enum.vcproj | 4 +- src/mod/applications/mod_esf/mod_esf.vcproj | 2 - src/mod/applications/mod_rss/mod_rss.vcproj | 2 - .../mod_voicemail/mod_voicemail.vcproj | 2 - .../asr_tts/mod_cepstral/mod_cepstral.vcproj | 2 - .../asr_tts/mod_openmrcp/mod_openmrcp.vcproj | 4 - src/mod/codecs/mod_amr/mod_amr.vcproj | 4 - src/mod/codecs/mod_g711/mod_g711.vcproj | 2 - src/mod/codecs/mod_g722/mod_g722.vcproj | 2 - src/mod/codecs/mod_g723_1/mod_g723_1.vcproj | 4 - src/mod/codecs/mod_g726/mod_g726.vcproj | 2 - src/mod/codecs/mod_g729/mod_g729.vcproj | 4 - src/mod/codecs/mod_gsm/mod_gsm.vcproj | 2 - src/mod/codecs/mod_h26x/mod_h26x.vcproj | 2 - src/mod/codecs/mod_ilbc/mod_ilbc.vcproj | 2 - src/mod/codecs/mod_l16/mod_l16.vcproj | 2 - src/mod/codecs/mod_speex/mod_speex.vcproj | 2 - .../mod_dialplan_directory.vcproj | 2 - .../mod_dialplan_xml/mod_dialplan_xml.vcproj | 2 - src/mod/directories/mod_ldap/mod_ldap.vcproj | 4 - .../mod_dingaling/mod_dingaling.vcproj | 2 - src/mod/endpoints/mod_iax/mod_iax.vcproj | 2 - .../mod_portaudio/mod_PortAudio.vcproj | 2 - src/mod/endpoints/mod_sofia/mod_sofia.vcproj | 2 - .../endpoints/mod_woomera/mod_woomera.vcproj | 2 - src/mod/event_handlers/mod_cdr/mod_cdr.vcproj | 4 - .../mod_event_multicast.vcproj | 2 - .../mod_event_socket/mod_event_socket.vcproj | 2 - .../mod_zeroconf/mod_zeroconf.vcproj | 2 - .../mod_local_stream/mod_local_stream.vcproj | 2 - .../mod_native_file/mod_native_file.vcproj | 2 - .../formats/mod_sndfile/mod_sndfile.vcproj | 2 - src/mod/languages/mod_perl/mod_perl.vcproj | 2 - .../mod_spidermonkey/mod_spidermonkey.vcproj | 2 - .../mod_spidermonkey_core_db.vcproj | 2 - .../mod_spidermonkey_etpan.vcproj | 2 - .../mod_spidermonkey_odbc.vcproj | 2 - .../mod_spidermonkey_socket.vcproj | 1 - .../mod_spidermonkey_teletone.vcproj | 2 - .../loggers/mod_console/mod_console.vcproj | 2 - src/mod/say/mod_say_de/mod_say_de.vcproj | 2 - src/mod/say/mod_say_en/mod_say_en.vcproj | 2 - src/mod/say/mod_say_es/mod_say_es.vcproj | 2 - src/mod/say/mod_say_fr/mod_say_fr.vcproj | 2 - src/mod/say/mod_say_it/mod_say_it.vcproj | 2 - src/mod/say/mod_say_nl/mod_say_nl.vcproj | 2 - .../xml_int/mod_xml_cdr/mod_xml_cdr.vcproj | 2 - .../xml_int/mod_xml_curl/mod_xml_curl.vcproj | 2 - .../xml_int/mod_xml_rpc/mod_xml_rpc.vcproj | 2 - w32/Console/FreeSwitchConsole.vcproj | 2 - w32/Library/FreeSwitchCore.vcproj | 6 +- w32/winlibs.vsprops | 11 + 77 files changed, 17 insertions(+), 369 deletions(-) create mode 100644 w32/winlibs.vsprops diff --git a/Freeswitch.sln b/Freeswitch.sln index be6ba3f93c..bdcb0a11b6 100644 --- a/Freeswitch.sln +++ b/Freeswitch.sln @@ -427,7 +427,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Default", "Default", "{3B08 ProjectSection(SolutionItems) = preProject conf\conference.conf.xml = conf\conference.conf.xml conf\console.conf.xml = conf\console.conf.xml - conf\default_context.xml = conf\default_context.xml conf\dialplan_directory.conf.xml = conf\dialplan_directory.conf.xml conf\dingaling.conf.xml = conf\dingaling.conf.xml conf\directory.xml = conf\directory.xml @@ -529,6 +528,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Build System", "_Build Sys build\buildlib.sh = build\buildlib.sh configure.in = configure.in Makefile.am = Makefile.am + build\modmake.rules.in = build\modmake.rules.in build\modules.conf.in = build\modules.conf.in libs\win32\util.vbs = libs\win32\util.vbs EndProjectSection diff --git a/libs/portaudio/build/msvc/portaudio.vcproj b/libs/portaudio/build/msvc/portaudio.vcproj index 7854c90b80..7800d9d38a 100644 --- a/libs/portaudio/build/msvc/portaudio.vcproj +++ b/libs/portaudio/build/msvc/portaudio.vcproj @@ -22,7 +22,6 @@ OutputDirectory="$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" > @@ -100,7 +99,6 @@ OutputDirectory="$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" > @@ -178,7 +176,6 @@ OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" > @@ -273,7 +270,6 @@ OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" > diff --git a/libs/win32/Download HOWL.vcproj b/libs/win32/Download HOWL.vcproj index 9f3ec3f407..9924179a7c 100644 --- a/libs/win32/Download HOWL.vcproj +++ b/libs/win32/Download HOWL.vcproj @@ -20,7 +20,6 @@ OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="10" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > @@ -45,7 +44,6 @@ OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="10" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > diff --git a/libs/win32/Download PTHREAD.vcproj b/libs/win32/Download PTHREAD.vcproj index fced65093f..c437e32a5a 100644 --- a/libs/win32/Download PTHREAD.vcproj +++ b/libs/win32/Download PTHREAD.vcproj @@ -20,7 +20,6 @@ OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="10" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > @@ -45,7 +44,6 @@ OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="10" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > diff --git a/libs/win32/apr-iconv/libapriconv.vcproj b/libs/win32/apr-iconv/libapriconv.vcproj index b7c37b39b3..25f1b0c3aa 100644 --- a/libs/win32/apr-iconv/libapriconv.vcproj +++ b/libs/win32/apr-iconv/libapriconv.vcproj @@ -19,7 +19,6 @@ OutputDirectory="$(SolutionDir)Debug" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" > @@ -117,7 +116,6 @@ OutputDirectory="$(SolutionDir)Release" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" > diff --git a/libs/win32/apr-util/libaprutil.vcproj b/libs/win32/apr-util/libaprutil.vcproj index c6252376e7..7f0178bbed 100644 --- a/libs/win32/apr-util/libaprutil.vcproj +++ b/libs/win32/apr-util/libaprutil.vcproj @@ -19,7 +19,6 @@ OutputDirectory="$(SolutionDir)Debug" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" > @@ -119,7 +118,6 @@ OutputDirectory="$(SolutionDir)Release" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" > diff --git a/libs/win32/apr-util/xml.vcproj b/libs/win32/apr-util/xml.vcproj index 28013412f4..a48fb2ecab 100644 --- a/libs/win32/apr-util/xml.vcproj +++ b/libs/win32/apr-util/xml.vcproj @@ -19,7 +19,6 @@ OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" @@ -94,7 +93,6 @@ OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" diff --git a/libs/win32/apr/libapr.vcproj b/libs/win32/apr/libapr.vcproj index ff6e0e4578..5a12d9af7a 100644 --- a/libs/win32/apr/libapr.vcproj +++ b/libs/win32/apr/libapr.vcproj @@ -19,7 +19,6 @@ OutputDirectory="$(SolutionDir)Debug" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" > @@ -118,7 +117,6 @@ OutputDirectory="$(SolutionDir)Release" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" > diff --git a/libs/win32/curl/curllib.vcproj b/libs/win32/curl/curllib.vcproj index 02676d12eb..000ae12067 100644 --- a/libs/win32/curl/curllib.vcproj +++ b/libs/win32/curl/curllib.vcproj @@ -19,7 +19,6 @@ OutputDirectory=".\Release" IntermediateDirectory=".\Release" ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" @@ -100,7 +99,6 @@ OutputDirectory=".\Debug" IntermediateDirectory=".\Debug" ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" diff --git a/libs/win32/etpan/libetpan.vcproj b/libs/win32/etpan/libetpan.vcproj index 1c4c13e19d..2d92c12088 100644 --- a/libs/win32/etpan/libetpan.vcproj +++ b/libs/win32/etpan/libetpan.vcproj @@ -20,7 +20,6 @@ OutputDirectory="Debug" IntermediateDirectory="Debug" ConfigurationType="2" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" > @@ -119,7 +118,6 @@ OutputDirectory="$(SolutionDir)Debug" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" > @@ -695,90 +693,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -105,7 +104,6 @@ OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" > @@ -191,7 +189,6 @@ OutputDirectory="$(SolutionDir)Debug" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" > @@ -293,7 +290,6 @@ OutputDirectory="$(SolutionDir)Release" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" > diff --git a/libs/win32/pthread/pthread.vcproj b/libs/win32/pthread/pthread.vcproj index 51a04ccf5c..be509dbc11 100644 --- a/libs/win32/pthread/pthread.vcproj +++ b/libs/win32/pthread/pthread.vcproj @@ -19,7 +19,6 @@ OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" @@ -100,7 +99,6 @@ OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" @@ -181,7 +179,6 @@ OutputDirectory="$(SolutionDir)Debug" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" @@ -281,7 +278,6 @@ OutputDirectory="$(SolutionDir)Release" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" diff --git a/libs/win32/sofia/libsofia_sip_ua_static.vcproj b/libs/win32/sofia/libsofia_sip_ua_static.vcproj index 9e0928cbd5..3d89b77971 100644 --- a/libs/win32/sofia/libsofia_sip_ua_static.vcproj +++ b/libs/win32/sofia/libsofia_sip_ua_static.vcproj @@ -19,7 +19,6 @@ OutputDirectory=".\Debug" IntermediateDirectory=".\Debug" ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" @@ -98,7 +97,6 @@ OutputDirectory=".\Release" IntermediateDirectory=".\Release" ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" diff --git a/libs/win32/speex/libspeex.vcproj b/libs/win32/speex/libspeex.vcproj index 5f2f4607e2..ba93eaf903 100644 --- a/libs/win32/speex/libspeex.vcproj +++ b/libs/win32/speex/libspeex.vcproj @@ -19,7 +19,6 @@ OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" > @@ -93,7 +92,6 @@ OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" > diff --git a/libs/win32/sqlite/sqlite.vcproj b/libs/win32/sqlite/sqlite.vcproj index d0aa5f918e..a7673a8219 100644 --- a/libs/win32/sqlite/sqlite.vcproj +++ b/libs/win32/sqlite/sqlite.vcproj @@ -20,7 +20,6 @@ OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" > @@ -103,7 +102,6 @@ OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > diff --git a/w32/Library/FreeSwitchCore.vcproj b/w32/Library/FreeSwitchCore.vcproj index 2f8ef920c5..a9a3dc9452 100644 --- a/w32/Library/FreeSwitchCore.vcproj +++ b/w32/Library/FreeSwitchCore.vcproj @@ -20,7 +20,6 @@ OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > @@ -114,7 +113,6 @@ OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > @@ -479,11 +477,11 @@ > + + +