Author: mikej Date: Fri Oct 19 02:44:27 2007 New Revision: 5991 Modified: freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.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/event_handlers/mod_zeroconf/mod_zeroconf.vcproj freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.vcproj freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.vcproj freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.vcproj freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.vcproj freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.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/modules.vsprops freeswitch/trunk/w32/winlibs.vsprops Log: use winlibs.vsprops to include the windows system libs, so that we will work on incorrectly configured visual studio express edition better. 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 Fri Oct 19 02:44:27 2007 @@ -25,10 +25,6 @@ Name="VCCLCompilerTool" UsePrecompiledHeader="0" /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="Ws2_32.lib " - /> </Configuration> <Configuration Name="Release|Win32" @@ -40,10 +36,6 @@ Name="VCCLCompilerTool" UsePrecompiledHeader="0" /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="Ws2_32.lib " - /> </Configuration> </Configurations> <References> 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 Fri Oct 19 02:44:27 2007 @@ -33,7 +33,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="Ws2_32.lib olber32.lib oldap_r.lib" + AdditionalDependencies="olber32.lib oldap_r.lib" LinkIncremental="2" AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\openldap\$(OutDir)"" /> @@ -55,7 +55,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="Ws2_32.lib olber32.lib oldap_r.lib" + AdditionalDependencies="olber32.lib oldap_r.lib" AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\openldap\$(OutDir)"" /> </Configuration> @@ -73,7 +73,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="Ws2_32.lib Wldap32.lib" + AdditionalDependencies="Wldap32.lib" LinkIncremental="1" AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\openldap\$(OutDir)"" /> @@ -93,7 +93,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="Ws2_32.lib Wldap32.lib" + AdditionalDependencies="Wldap32.lib" LinkIncremental="1" AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\openldap\$(OutDir)"" /> 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 Fri Oct 19 02:44:27 2007 @@ -29,7 +29,6 @@ <Tool Name="VCLinkerTool" AdditionalOptions="/NODEFAULTLIB:LIMBCTD" - AdditionalDependencies="Ws2_32.lib" AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\libdingaling\$(OutDir)";"$(InputDir)..\..\..\..\libs\iksemel\$(OutDir)"" /> </Configuration> @@ -46,7 +45,6 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="Ws2_32.lib" AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\libdingaling\$(OutDir)";"$(InputDir)..\..\..\..\libs\iksemel\$(OutDir)"" /> </Configuration> 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 Fri Oct 19 02:44:27 2007 @@ -31,7 +31,6 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="Ws2_32.lib Iphlpapi.lib Winmm.lib" AdditionalLibraryDirectories=""..\..\..\..\libs\iax\$(OutDir)"" /> </Configuration> @@ -49,7 +48,6 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="Ws2_32.lib Iphlpapi.lib Winmm.lib" AdditionalLibraryDirectories=""..\..\..\..\libs\iax\$(OutDir)"" /> </Configuration> 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 Fri Oct 19 02:44:27 2007 @@ -31,7 +31,6 @@ <Tool Name="VCLinkerTool" AdditionalOptions="/NODEFAULTLIB:LIMBCTD" - AdditionalDependencies="Ws2_32.lib Iphlpapi.lib Winmm.lib" AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\portaudio\winvc\Lib"" /> </Configuration> @@ -50,7 +49,6 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="Ws2_32.lib Iphlpapi.lib Winmm.lib" AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\portaudio\winvc\Lib"" /> </Configuration> 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 Fri Oct 19 02:44:27 2007 @@ -28,7 +28,6 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="Ws2_32.lib iphlpapi.lib" AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\howl\src\lib\howl\Win32\$(OutDir)";"$(InputDir)..\..\..\..\libs\howl\src\lib\mDNSResponder\Win32\$(OutDir)"" /> </Configuration> @@ -45,7 +44,6 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="Ws2_32.lib iphlpapi.lib" AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\howl\src\lib\howl\Win32\$(OutDir)";"$(InputDir)..\..\..\..\libs\howl\src\lib\mDNSResponder\Win32\$(OutDir)"" /> </Configuration> Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.vcproj ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.vcproj (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.vcproj Fri Oct 19 02:44:27 2007 @@ -20,6 +20,7 @@ OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops" CharacterSet="2" > <Tool @@ -55,7 +56,6 @@ <Tool 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"" @@ -71,6 +71,7 @@ OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops" CharacterSet="2" > <Tool @@ -104,7 +105,6 @@ <Tool 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"" Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.vcproj ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.vcproj (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.vcproj Fri Oct 19 02:44:27 2007 @@ -20,6 +20,7 @@ OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops" CharacterSet="2" > <Tool @@ -55,7 +56,6 @@ <Tool 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"" @@ -71,6 +71,7 @@ OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops" CharacterSet="2" > <Tool @@ -104,7 +105,6 @@ <Tool 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"" Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.vcproj ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.vcproj (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.vcproj Fri Oct 19 02:44:27 2007 @@ -20,6 +20,7 @@ OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops" CharacterSet="2" > <Tool @@ -55,7 +56,6 @@ <Tool Name="VCLinkerTool" LinkLibraryDependencies="true" - AdditionalDependencies="ws2_32.lib winmm.lib odbc32.lib " OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" LinkIncremental="1" AdditionalLibraryDirectories=""..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib"" @@ -71,6 +71,7 @@ OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops" CharacterSet="2" > <Tool @@ -104,7 +105,6 @@ <Tool Name="VCLinkerTool" LinkLibraryDependencies="true" - AdditionalDependencies="ws2_32.lib winmm.lib odbc32.lib " OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" LinkIncremental="1" AdditionalLibraryDirectories=""..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib"" Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.vcproj ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.vcproj (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.vcproj Fri Oct 19 02:44:27 2007 @@ -20,6 +20,7 @@ OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops" CharacterSet="1" > <Tool @@ -69,6 +70,7 @@ OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops" CharacterSet="1" WholeProgramOptimization="1" > Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.vcproj ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.vcproj (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.vcproj Fri Oct 19 02:44:27 2007 @@ -20,6 +20,7 @@ OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops" CharacterSet="2" > <Tool @@ -55,7 +56,6 @@ <Tool 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"" @@ -71,6 +71,7 @@ OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops" CharacterSet="2" > <Tool @@ -104,7 +105,6 @@ <Tool 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"" 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 Fri Oct 19 02:44:27 2007 @@ -29,7 +29,6 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="Ws2_32.lib Winmm.lib" /> </Configuration> <Configuration @@ -46,7 +45,6 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="Ws2_32.lib Winmm.lib" AdditionalLibraryDirectories="" /> </Configuration> 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 Fri Oct 19 02:44:27 2007 @@ -29,7 +29,6 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="Winmm.lib Ws2_32.lib" AdditionalLibraryDirectories="..\..\..\..\libs\xmlcurl\lib;"..\..\..\..\libs\xmlcurl\lib\abyss\src\$(OutDir)";"..\..\..\..\libs\apr-util\xml\expat\lib\LibD"" /> </Configuration> @@ -47,7 +46,6 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="Winmm.lib Ws2_32.lib" AdditionalLibraryDirectories="..\..\..\..\libs\xmlcurl\lib;"..\..\..\..\libs\xmlcurl\lib\abyss\src\$(OutDir)";"..\..\..\..\libs\apr-util\xml\expat\lib\LibR"" /> </Configuration> 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 Fri Oct 19 02:44:27 2007 @@ -29,7 +29,6 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="Ws2_32.lib" AdditionalLibraryDirectories="..\..\..\..\libs\xmlrpc\lib;"..\..\..\..\libs\xmlrpc\lib\abyss\src\$(OutDir)";"..\..\..\..\libs\apr-util\xml\expat\lib\LibD"" /> </Configuration> @@ -47,7 +46,6 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="Ws2_32.lib" AdditionalLibraryDirectories="..\..\..\..\libs\xmlrpc\lib;"..\..\..\..\libs\xmlrpc\lib\abyss\src\$(OutDir)";"..\..\..\..\libs\apr-util\xml\expat\lib\LibR"" /> </Configuration> Modified: freeswitch/trunk/w32/modules.vsprops ============================================================================== --- freeswitch/trunk/w32/modules.vsprops (original) +++ freeswitch/trunk/w32/modules.vsprops Fri Oct 19 02:44:27 2007 @@ -5,6 +5,7 @@ Name="modules" OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" + InheritedPropertySheets=".\winlibs.vsprops" > <Tool Name="VCCLCompilerTool" Modified: freeswitch/trunk/w32/winlibs.vsprops ============================================================================== --- freeswitch/trunk/w32/winlibs.vsprops (original) +++ freeswitch/trunk/w32/winlibs.vsprops Fri Oct 19 02:44:27 2007 @@ -2,10 +2,10 @@ <VisualStudioPropertySheet ProjectType="Visual C++" Version="8.00" - Name="Core Windows Libraries" + Name="Freeswitch Core Windows Libraries" > <Tool Name="VCLinkerTool" - AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib" + AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Ws2_32.lib Iphlpapi.lib Winmm.lib" /> </VisualStudioPropertySheet>