]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
use winlibs.vsprops to include the windows system libs, so that we will work on incor...
authorMichael Jerris <mike@jerris.com>
Fri, 19 Oct 2007 06:44:27 +0000 (06:44 +0000)
committerMichael Jerris <mike@jerris.com>
Fri, 19 Oct 2007 06:44:27 +0000 (06:44 +0000)
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5991 d0543943-73ff-0310-b7d9-9358b9ac24b2

16 files changed:
src/mod/applications/mod_esf/mod_esf.vcproj
src/mod/directories/mod_ldap/mod_ldap.vcproj
src/mod/endpoints/mod_dingaling/mod_dingaling.vcproj
src/mod/endpoints/mod_iax/mod_iax.vcproj
src/mod/endpoints/mod_portaudio/mod_PortAudio.vcproj
src/mod/event_handlers/mod_zeroconf/mod_zeroconf.vcproj
src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.vcproj
src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.vcproj
src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.vcproj
src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.vcproj
src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.vcproj
src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.vcproj
src/mod/xml_int/mod_xml_curl/mod_xml_curl.vcproj
src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj
w32/modules.vsprops
w32/winlibs.vsprops

index fc4c1e379defd5e0376a2aebcd0c794e3649a618..dd7d54cc6db634c79fe55bd3b73d723c8127f01e 100644 (file)
                                Name="VCCLCompilerTool"\r
                                UsePrecompiledHeader="0"\r
                        />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               AdditionalDependencies="Ws2_32.lib "\r
-                       />\r
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
                                Name="VCCLCompilerTool"\r
                                UsePrecompiledHeader="0"\r
                        />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               AdditionalDependencies="Ws2_32.lib "\r
-                       />\r
                </Configuration>\r
        </Configurations>\r
        <References>\r
index 85fec11c2b48d7c726f4abff149b7fd802a139d2..bb15460e398464fac728e95d0df64ba1178892d2 100644 (file)
@@ -33,7 +33,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="Ws2_32.lib olber32.lib oldap_r.lib"\r
+                               AdditionalDependencies="olber32.lib oldap_r.lib"\r
                                LinkIncremental="2"\r
                                AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\openldap\$(OutDir)&quot;"\r
                        />\r
@@ -55,7 +55,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="Ws2_32.lib olber32.lib oldap_r.lib"\r
+                               AdditionalDependencies="olber32.lib oldap_r.lib"\r
                                AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\openldap\$(OutDir)&quot;"\r
                        />\r
                </Configuration>\r
@@ -73,7 +73,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="Ws2_32.lib Wldap32.lib"\r
+                               AdditionalDependencies="Wldap32.lib"\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\openldap\$(OutDir)&quot;"\r
                        />\r
@@ -93,7 +93,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="Ws2_32.lib Wldap32.lib"\r
+                               AdditionalDependencies="Wldap32.lib"\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\openldap\$(OutDir)&quot;"\r
                        />\r
index 854a7cc49c246d264c53654a3ee3ce0d803ed7dd..1d726794e870cba6f88a9a5b16e2641a9a44eb7a 100644 (file)
@@ -29,7 +29,6 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions="/NODEFAULTLIB:LIMBCTD"\r
-                               AdditionalDependencies="Ws2_32.lib"\r
                                AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\libdingaling\$(OutDir)&quot;;&quot;$(InputDir)..\..\..\..\libs\iksemel\$(OutDir)&quot;"\r
                        />\r
                </Configuration>\r
@@ -46,7 +45,6 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="Ws2_32.lib"\r
                                AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\libdingaling\$(OutDir)&quot;;&quot;$(InputDir)..\..\..\..\libs\iksemel\$(OutDir)&quot;"\r
                        />\r
                </Configuration>\r
index 0782bb437760717ce9aa86ad2692102bb8ad0ca6..b1574ea7d42876b57c71a4a1c84a404625973e14 100644 (file)
@@ -31,7 +31,6 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="Ws2_32.lib Iphlpapi.lib Winmm.lib"\r
                                AdditionalLibraryDirectories="&quot;..\..\..\..\libs\iax\$(OutDir)&quot;"\r
                        />\r
                </Configuration>\r
@@ -49,7 +48,6 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="Ws2_32.lib Iphlpapi.lib Winmm.lib"\r
                                AdditionalLibraryDirectories="&quot;..\..\..\..\libs\iax\$(OutDir)&quot;"\r
                        />\r
                </Configuration>\r
index 07913f290f4961fe406368cda8c031f7f567dcd8..5bfec8219fe59e3900c4852e4469c2b7662158f0 100644 (file)
@@ -31,7 +31,6 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions="/NODEFAULTLIB:LIMBCTD"\r
-                               AdditionalDependencies="Ws2_32.lib Iphlpapi.lib  Winmm.lib"\r
                                AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\portaudio\winvc\Lib&quot;"\r
                        />\r
                </Configuration>\r
@@ -50,7 +49,6 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="Ws2_32.lib Iphlpapi.lib Winmm.lib"\r
                                AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\portaudio\winvc\Lib&quot;"\r
                        />\r
                </Configuration>\r
index 981e6acf849dba3561f14cd85f4f885b47cb3f2d..ff68e46f72d2146b0577cad2d235ebeeba71e417 100644 (file)
@@ -28,7 +28,6 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="Ws2_32.lib  iphlpapi.lib"\r
                                AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\howl\src\lib\howl\Win32\$(OutDir)&quot;;&quot;$(InputDir)..\..\..\..\libs\howl\src\lib\mDNSResponder\Win32\$(OutDir)&quot;"\r
                        />\r
                </Configuration>\r
@@ -45,7 +44,6 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="Ws2_32.lib iphlpapi.lib"\r
                                AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\howl\src\lib\howl\Win32\$(OutDir)&quot;;&quot;$(InputDir)..\..\..\..\libs\howl\src\lib\mDNSResponder\Win32\$(OutDir)&quot;"\r
                        />\r
                </Configuration>\r
index b62394c02776e064f65d4824c7d2ad28f9617aee..0b0d74f5620ed6dce37cf643c031b79061318b7f 100644 (file)
@@ -20,6 +20,7 @@
                        OutputDirectory="$(ConfigurationName)"\r
                        IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="2"\r
+                       InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops"\r
                        CharacterSet="2"\r
                        >\r
                        <Tool\r
@@ -55,7 +56,6 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkLibraryDependencies="true"\r
-                               AdditionalDependencies="ws2_32.lib winmm.lib"\r
                                OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories="&quot;..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib&quot;"\r
@@ -71,6 +71,7 @@
                        OutputDirectory="$(ConfigurationName)"\r
                        IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="2"\r
+                       InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops"\r
                        CharacterSet="2"\r
                        >\r
                        <Tool\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkLibraryDependencies="true"\r
-                               AdditionalDependencies="ws2_32.lib winmm.lib"\r
                                OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories="&quot;..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib&quot;"\r
index 6a80efcefac5ccc3293861458c93a53d1afc8a6a..cd3b67f6df0202ca1ecdd20411755e538fd4886e 100644 (file)
@@ -20,6 +20,7 @@
                        OutputDirectory="$(ConfigurationName)"\r
                        IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="2"\r
+                       InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops"\r
                        CharacterSet="2"\r
                        >\r
                        <Tool\r
@@ -55,7 +56,6 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkLibraryDependencies="true"\r
-                               AdditionalDependencies="ws2_32.lib winmm.lib"\r
                                OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories="&quot;..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib&quot;"\r
@@ -71,6 +71,7 @@
                        OutputDirectory="$(ConfigurationName)"\r
                        IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="2"\r
+                       InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops"\r
                        CharacterSet="2"\r
                        >\r
                        <Tool\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkLibraryDependencies="true"\r
-                               AdditionalDependencies="ws2_32.lib winmm.lib"\r
                                OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories="&quot;..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib&quot;"\r
index dd9a0c2d010d00da5e908eaf82f8f8eb2776542e..5ad69adf574443e9428bf5e446c44d565f2aab31 100644 (file)
@@ -20,6 +20,7 @@
                        OutputDirectory="$(ConfigurationName)"\r
                        IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="2"\r
+                       InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops"\r
                        CharacterSet="2"\r
                        >\r
                        <Tool\r
@@ -55,7 +56,6 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkLibraryDependencies="true"\r
-                               AdditionalDependencies="ws2_32.lib winmm.lib odbc32.lib "\r
                                OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories="&quot;..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib&quot;"\r
@@ -71,6 +71,7 @@
                        OutputDirectory="$(ConfigurationName)"\r
                        IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="2"\r
+                       InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops"\r
                        CharacterSet="2"\r
                        >\r
                        <Tool\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkLibraryDependencies="true"\r
-                               AdditionalDependencies="ws2_32.lib winmm.lib odbc32.lib "\r
                                OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories="&quot;..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib&quot;"\r
index 90ad894a70a2ac55f06df1f833fa05ddad3d3b43..13c1129abd5d31d42c813330995866a3f3fb81d1 100644 (file)
@@ -20,6 +20,7 @@
                        OutputDirectory="$(ConfigurationName)"\r
                        IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="2"\r
+                       InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops"\r
                        CharacterSet="1"\r
                        >\r
                        <Tool\r
@@ -69,6 +70,7 @@
                        OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
                        IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="2"\r
+                       InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops"\r
                        CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
index f34d9490f6a90910a8043d2f9fc211f03e931a87..a0847b60aa1cc8395ab4257eae5fef28ffe26f78 100644 (file)
@@ -20,6 +20,7 @@
                        OutputDirectory="$(ConfigurationName)"\r
                        IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="2"\r
+                       InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops"\r
                        CharacterSet="2"\r
                        >\r
                        <Tool\r
@@ -55,7 +56,6 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkLibraryDependencies="true"\r
-                               AdditionalDependencies="ws2_32.lib winmm.lib "\r
                                OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories="&quot;..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib&quot;"\r
@@ -71,6 +71,7 @@
                        OutputDirectory="$(ConfigurationName)"\r
                        IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="2"\r
+                       InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops"\r
                        CharacterSet="2"\r
                        >\r
                        <Tool\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkLibraryDependencies="true"\r
-                               AdditionalDependencies="ws2_32.lib winmm.lib "\r
                                OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories="&quot;..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib&quot;"\r
index 853c4caa779829a9afed151429131be798bd974f..d1f7b3ec7356e9d3f604cbda064d3ca70bfc893a 100644 (file)
@@ -29,7 +29,6 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="Ws2_32.lib Winmm.lib"\r
                        />\r
                </Configuration>\r
                <Configuration\r
@@ -46,7 +45,6 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="Ws2_32.lib Winmm.lib"\r
                                AdditionalLibraryDirectories=""\r
                        />\r
                </Configuration>\r
index 10ec12f8c3ff05241669087b513f2742504510cc..826a8a2b32c8434d2911225c728a48cc4482982f 100644 (file)
@@ -29,7 +29,6 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="Winmm.lib Ws2_32.lib"\r
                                AdditionalLibraryDirectories="..\..\..\..\libs\xmlcurl\lib;&quot;..\..\..\..\libs\xmlcurl\lib\abyss\src\$(OutDir)&quot;;&quot;..\..\..\..\libs\apr-util\xml\expat\lib\LibD&quot;"\r
                        />\r
                </Configuration>\r
@@ -47,7 +46,6 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="Winmm.lib Ws2_32.lib"\r
                                AdditionalLibraryDirectories="..\..\..\..\libs\xmlcurl\lib;&quot;..\..\..\..\libs\xmlcurl\lib\abyss\src\$(OutDir)&quot;;&quot;..\..\..\..\libs\apr-util\xml\expat\lib\LibR&quot;"\r
                        />\r
                </Configuration>\r
index 3290caf634624e21f659af359f548368d204e87e..aaa24dbfcd385cea83ffedc8ab25ac06ca821502 100644 (file)
@@ -29,7 +29,6 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="Ws2_32.lib"\r
                                AdditionalLibraryDirectories="..\..\..\..\libs\xmlrpc\lib;&quot;..\..\..\..\libs\xmlrpc\lib\abyss\src\$(OutDir)&quot;;&quot;..\..\..\..\libs\apr-util\xml\expat\lib\LibD&quot;"\r
                        />\r
                </Configuration>\r
@@ -47,7 +46,6 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="Ws2_32.lib"\r
                                AdditionalLibraryDirectories="..\..\..\..\libs\xmlrpc\lib;&quot;..\..\..\..\libs\xmlrpc\lib\abyss\src\$(OutDir)&quot;;&quot;..\..\..\..\libs\apr-util\xml\expat\lib\LibR&quot;"\r
                        />\r
                </Configuration>\r
index fb8e6fdd048c66c7c0b84ecf518ee9b860bb36fb..eb21d1c85610a0e4dc39686939d5ef7f824fe13c 100644 (file)
@@ -5,6 +5,7 @@
        Name="modules"\r
        OutputDirectory="$(ConfigurationName)"\r
        IntermediateDirectory="$(ConfigurationName)"\r
+       InheritedPropertySheets=".\winlibs.vsprops"\r
        >\r
        <Tool\r
                Name="VCCLCompilerTool"\r
index a1518462d61ff726ad71783a8a81875de699965e..c5ec630f3c66419b286038d102f6089301ccbf0d 100644 (file)
@@ -2,10 +2,10 @@
 <VisualStudioPropertySheet\r
        ProjectType="Visual C++"\r
        Version="8.00"\r
-       Name="Core Windows Libraries"\r
+       Name="Freeswitch Core Windows Libraries"\r
        >\r
        <Tool\r
                Name="VCLinkerTool"\r
-               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"\r
+               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"\r
        />\r
 </VisualStudioPropertySheet>\r