diff options
| author | Benny Prijono <bennylp@teluu.com> | 2007-03-25 18:44:51 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2007-03-25 18:44:51 +0000 |
| commit | 84b0defcf6903a8b014ab1ba38d8923282f230ed (patch) | |
| tree | 4f6ba42e6908ed6803e7793b61c350676e165697 /pjlib/build | |
| parent | cd2cbf5e5a3a0393054a4bbd60ee03576f3fa504 (diff) | |
ICE (work in progress): use single socket for all candidates in component, and implemented IP interface enumeration on Win32
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1104 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjlib/build')
| -rw-r--r-- | pjlib/build/pjlib.dsp | 13 | ||||
| -rw-r--r-- | pjlib/build/pjlib.vcproj | 60 |
2 files changed, 57 insertions, 16 deletions
diff --git a/pjlib/build/pjlib.dsp b/pjlib/build/pjlib.dsp index 39df8bcc..bd841f71 100644 --- a/pjlib/build/pjlib.dsp +++ b/pjlib/build/pjlib.dsp @@ -110,6 +110,11 @@ SOURCE=..\src\pj\ioqueue_epoll.c # End Source File
# Begin Source File
+SOURCE=..\src\pj\ip_helper_generic.c
+# PROP Exclude_From_Build 1
+# End Source File
+# Begin Source File
+
SOURCE=..\src\pj\log_writer_printk.c
# PROP Exclude_From_Build 1
# End Source File
@@ -254,6 +259,10 @@ SOURCE=..\src\pj\ioqueue_winnt.c # End Source File
# Begin Source File
+SOURCE=..\src\pj\ip_helper_win32.c
+# End Source File
+# Begin Source File
+
SOURCE=..\src\pj\list.c
# End Source File
# Begin Source File
@@ -518,6 +527,10 @@ SOURCE=..\include\pj\ioqueue.h # End Source File
# Begin Source File
+SOURCE=..\include\pj\ip_helper.h
+# End Source File
+# Begin Source File
+
SOURCE=..\include\pj\list.h
# End Source File
# Begin Source File
diff --git a/pjlib/build/pjlib.vcproj b/pjlib/build/pjlib.vcproj index ec3c5644..92183780 100644 --- a/pjlib/build/pjlib.vcproj +++ b/pjlib/build/pjlib.vcproj @@ -16,8 +16,8 @@ <Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory=".\output\pjlib-i386-win32-vc6-debug"
- IntermediateDirectory=".\output\pjlib-i386-win32-vc6-debug"
+ OutputDirectory=".\output\pjlib-i386-win32-vc8-debug"
+ IntermediateDirectory=".\output\pjlib-i386-win32-vc8-debug"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
UseOfMFC="0"
@@ -47,10 +47,10 @@ MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
- PrecompiledHeaderFile=".\output\pjlib-i386-win32-vc6-debug/pjlib.pch"
- AssemblerListingLocation=".\output\pjlib-i386-win32-vc6-debug/"
- ObjectFile=".\output\pjlib-i386-win32-vc6-debug/"
- ProgramDataBaseFileName=".\output\pjlib-i386-win32-vc6-debug/"
+ PrecompiledHeaderFile=".\output\pjlib-i386-win32-vc8-debug/pjlib.pch"
+ AssemblerListingLocation=".\output\pjlib-i386-win32-vc8-debug/"
+ ObjectFile=".\output\pjlib-i386-win32-vc8-debug/"
+ ProgramDataBaseFileName=".\output\pjlib-i386-win32-vc8-debug/"
BrowseInformation="1"
WarningLevel="4"
SuppressStartupBanner="true"
@@ -69,7 +69,7 @@ />
<Tool
Name="VCLibrarianTool"
- OutputFile="../lib/pjlib-i386-win32-vc6-debug.lib"
+ OutputFile="../lib/pjlib-i386-win32-vc8-debug.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -81,7 +81,7 @@ <Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
- OutputFile=".\output\pjlib-i386-win32-vc6-debug/pjlib.bsc"
+ OutputFile=".\output\pjlib-i386-win32-vc8-debug/pjlib.bsc"
/>
<Tool
Name="VCFxCopTool"
@@ -92,8 +92,8 @@ </Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory=".\output\pjlib-i386-win32-vc6-release"
- IntermediateDirectory=".\output\pjlib-i386-win32-vc6-release"
+ OutputDirectory=".\output\pjlib-i386-win32-vc8-release"
+ IntermediateDirectory=".\output\pjlib-i386-win32-vc8-release"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
UseOfMFC="0"
@@ -124,10 +124,10 @@ StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
- PrecompiledHeaderFile=".\output\pjlib-i386-win32-vc6-release/pjlib.pch"
- AssemblerListingLocation=".\output\pjlib-i386-win32-vc6-release/"
- ObjectFile=".\output\pjlib-i386-win32-vc6-release/"
- ProgramDataBaseFileName=".\output\pjlib-i386-win32-vc6-release/"
+ PrecompiledHeaderFile=".\output\pjlib-i386-win32-vc8-release/pjlib.pch"
+ AssemblerListingLocation=".\output\pjlib-i386-win32-vc8-release/"
+ ObjectFile=".\output\pjlib-i386-win32-vc8-release/"
+ ProgramDataBaseFileName=".\output\pjlib-i386-win32-vc8-release/"
BrowseInformation="1"
WarningLevel="4"
SuppressStartupBanner="true"
@@ -146,7 +146,7 @@ />
<Tool
Name="VCLibrarianTool"
- OutputFile="../lib/pjlib-i386-win32-vc6-release.lib"
+ OutputFile="../lib/pjlib-i386-win32-vc8-release.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -158,7 +158,7 @@ <Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
- OutputFile=".\output\pjlib-i386-win32-vc6-release/pjlib.bsc"
+ OutputFile=".\output\pjlib-i386-win32-vc8-release/pjlib.bsc"
/>
<Tool
Name="VCFxCopTool"
@@ -538,6 +538,10 @@ </FileConfiguration>
</File>
<File
+ RelativePath="..\src\pj\ip_helper_win32.c"
+ >
+ </File>
+ <File
RelativePath="..\src\pj\list.c"
>
<FileConfiguration
@@ -1121,6 +1125,26 @@ </FileConfiguration>
</File>
<File
+ RelativePath="..\src\pj\ip_helper_generic.c"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="..\src\pj\log_writer_printk.c"
>
<FileConfiguration
@@ -1459,6 +1483,10 @@ >
</File>
<File
+ RelativePath="..\include\pj\ip_helper.h"
+ >
+ </File>
+ <File
RelativePath="..\include\pj\list.h"
>
</File>
|