kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

use winlibs.vsprops to include the windows system libs, so that we will work on incorrectly configured visual studio express edition better. 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5991 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2007-10-19 06:44:27 +00:00
parent 42a9b8fb07
commit a65e34e233
16 changed files with 17 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/mod/applications/mod_esf/mod_esf.vcproj
View File

@ -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>

8
src/mod/directories/mod_ldap/mod_ldap.vcproj
View File

@ -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="&quot;$(InputDir)..\..\..\..\libs\openldap\$(OutDir)&quot;"
/>
@ -55,7 +55,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Ws2_32.lib olber32.lib oldap_r.lib"
AdditionalDependencies="olber32.lib oldap_r.lib"
AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\openldap\$(OutDir)&quot;"
/>
</Configuration>
@ -73,7 +73,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Ws2_32.lib Wldap32.lib"
AdditionalDependencies="Wldap32.lib"
LinkIncremental="1"
AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\openldap\$(OutDir)&quot;"
/>
@ -93,7 +93,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Ws2_32.lib Wldap32.lib"
AdditionalDependencies="Wldap32.lib"
LinkIncremental="1"
AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\openldap\$(OutDir)&quot;"
/>

2
src/mod/endpoints/mod_dingaling/mod_dingaling.vcproj
View File

@ -29,7 +29,6 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/NODEFAULTLIB:LIMBCTD"
AdditionalDependencies="Ws2_32.lib"
AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\libdingaling\$(OutDir)&quot;;&quot;$(InputDir)..\..\..\..\libs\iksemel\$(OutDir)&quot;"
/>
</Configuration>
@ -46,7 +45,6 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Ws2_32.lib"
AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\libdingaling\$(OutDir)&quot;;&quot;$(InputDir)..\..\..\..\libs\iksemel\$(OutDir)&quot;"
/>
</Configuration>

2
src/mod/endpoints/mod_iax/mod_iax.vcproj
View File

@ -31,7 +31,6 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Ws2_32.lib Iphlpapi.lib Winmm.lib"
AdditionalLibraryDirectories="&quot;..\..\..\..\libs\iax\$(OutDir)&quot;"
/>
</Configuration>
@ -49,7 +48,6 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Ws2_32.lib Iphlpapi.lib Winmm.lib"
AdditionalLibraryDirectories="&quot;..\..\..\..\libs\iax\$(OutDir)&quot;"
/>
</Configuration>

2
src/mod/endpoints/mod_portaudio/mod_PortAudio.vcproj
View File

@ -31,7 +31,6 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/NODEFAULTLIB:LIMBCTD"
AdditionalDependencies="Ws2_32.lib Iphlpapi.lib Winmm.lib"
AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\portaudio\winvc\Lib&quot;"
/>
</Configuration>
@ -50,7 +49,6 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Ws2_32.lib Iphlpapi.lib Winmm.lib"
AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\portaudio\winvc\Lib&quot;"
/>
</Configuration>

2
src/mod/event_handlers/mod_zeroconf/mod_zeroconf.vcproj
View File

@ -28,7 +28,6 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Ws2_32.lib iphlpapi.lib"
AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\howl\src\lib\howl\Win32\$(OutDir)&quot;;&quot;$(InputDir)..\..\..\..\libs\howl\src\lib\mDNSResponder\Win32\$(OutDir)&quot;"
/>
</Configuration>
@ -45,7 +44,6 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Ws2_32.lib iphlpapi.lib"
AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\howl\src\lib\howl\Win32\$(OutDir)&quot;;&quot;$(InputDir)..\..\..\..\libs\howl\src\lib\mDNSResponder\Win32\$(OutDir)&quot;"
/>
</Configuration>

4
src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.vcproj
View File

@ -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="&quot;..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib&quot;"
@ -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="&quot;..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib&quot;"

4
src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.vcproj
View File

@ -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="&quot;..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib&quot;"
@ -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="&quot;..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib&quot;"

4
src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.vcproj
View File

@ -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="&quot;..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib&quot;"
@ -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="&quot;..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib&quot;"

2
src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.vcproj
View File

@ -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"
>

4
src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.vcproj
View File

@ -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="&quot;..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib&quot;"
@ -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="&quot;..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib&quot;"

2
src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.vcproj
View File

@ -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>

2
src/mod/xml_int/mod_xml_curl/mod_xml_curl.vcproj
View File

@ -29,7 +29,6 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Winmm.lib Ws2_32.lib"
AdditionalLibraryDirectories="..\..\..\..\libs\xmlcurl\lib;&quot;..\..\..\..\libs\xmlcurl\lib\abyss\src\$(OutDir)&quot;;&quot;..\..\..\..\libs\apr-util\xml\expat\lib\LibD&quot;"
/>
</Configuration>
@ -47,7 +46,6 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Winmm.lib Ws2_32.lib"
AdditionalLibraryDirectories="..\..\..\..\libs\xmlcurl\lib;&quot;..\..\..\..\libs\xmlcurl\lib\abyss\src\$(OutDir)&quot;;&quot;..\..\..\..\libs\apr-util\xml\expat\lib\LibR&quot;"
/>
</Configuration>

2
src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj
View File

@ -29,7 +29,6 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Ws2_32.lib"
AdditionalLibraryDirectories="..\..\..\..\libs\xmlrpc\lib;&quot;..\..\..\..\libs\xmlrpc\lib\abyss\src\$(OutDir)&quot;;&quot;..\..\..\..\libs\apr-util\xml\expat\lib\LibD&quot;"
/>
</Configuration>
@ -47,7 +46,6 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Ws2_32.lib"
AdditionalLibraryDirectories="..\..\..\..\libs\xmlrpc\lib;&quot;..\..\..\..\libs\xmlrpc\lib\abyss\src\$(OutDir)&quot;;&quot;..\..\..\..\libs\apr-util\xml\expat\lib\LibR&quot;"
/>
</Configuration>

1
w32/modules.vsprops
View File

@ -5,6 +5,7 @@
Name="modules"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
InheritedPropertySheets=".\winlibs.vsprops"
>
<Tool
Name="VCCLCompilerTool"

4
w32/winlibs.vsprops
View File

@ -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>