Changeset 992 for pjproject/trunk/pjlib-util/build

Timestamp:

Feb 21, 2007 12:40:05 AM (18 years ago)

Author:

bennylp

Message:

Merged the ICE branch into the trunk

Location:

pjproject/trunk/pjlib-util/build

Files:

• Makefile (modified) (1 diff)
• pjlib_util.dsp (modified) (2 diffs)
• pjlib_util.dsw (modified) (2 diffs)
• pjlib_util.vcproj (modified) (2 diffs)
• pjstun_srv.dsp (copied) (copied from pjproject/branches/iceproject/pjlib-util/build/pjstun_srv.dsp)

pjproject/trunk/pjlib-util/build/Makefile

@@ -28 +28 @@
 export PJLIB_UTIL_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
                 errno.o dns.o dns_dump.o getopt.o md5.o resolver.o \
-                scanner.o stun.o string.o stun_client.o xml.o
+                scanner.o string.o stun_simple.o stun_simple_client.o xml.o
 export PJLIB_UTIL_CFLAGS += $(_CFLAGS)
 

pjproject/trunk/pjlib-util/build/pjlib_util.dsp

@@ -130 +130 @@
 # Begin Source File
 
-SOURCE="..\src\pjlib-util\stun.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\src\pjlib-util\stun_client.c"
+SOURCE="..\src\pjlib-util\stun_endpoint.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\src\pjlib-util\stun_msg.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\src\pjlib-util\stun_server.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\src\pjlib-util\stun_simple.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\src\pjlib-util\stun_simple_client.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\src\pjlib-util\stun_transaction.c"
 # End Source File
 # Begin Source File
@@ -194 +210 @@
 # Begin Source File
 
-SOURCE="..\include\pjlib-util\stun.h"
+SOURCE="..\include\pjlib-util\stun_doc.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\include\pjlib-util\stun_endpoint.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\include\pjlib-util\stun_msg.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\include\pjlib-util\stun_server.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\include\pjlib-util\stun_simple.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\include\pjlib-util\stun_transaction.h"
 # End Source File
 # Begin Source File

pjproject/trunk/pjlib-util/build/pjlib_util.dsw

@@ -20 +20 @@
 Package=<5>
 {{{
-    begin source code control
-    "$/pjproject/pjlib/build", UIAAAAAA
-    ..\..\pjlib\build
-    end source code control
 }}}
 
@@ -62 +58 @@
 ###############################################################################
 
+Project: "pjstun_srv"=".\pjstun_srv.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name pjlib
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name pjlib_util
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Global:
 

pjproject/trunk/pjlib-util/build/pjlib_util.vcproj

@@ -400 +400 @@
                         </File>
                         <File
-                                RelativePath="..\src\pjlib-util\stun.c"
-                                >
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="VCCLCompilerTool"
-                                                AdditionalIncludeDirectories=""
-                                                PreprocessorDefinitions=""
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="VCCLCompilerTool"
-                                                AdditionalIncludeDirectories=""
-                                                PreprocessorDefinitions=""
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\src\pjlib-util\stun_client.c"
-                                >
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="VCCLCompilerTool"
-                                                AdditionalIncludeDirectories=""
-                                                PreprocessorDefinitions=""
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="VCCLCompilerTool"
-                                                AdditionalIncludeDirectories=""
-                                                PreprocessorDefinitions=""
-                                        />
-                                </FileConfiguration>
+                                RelativePath="..\src\pjlib-util\stun_simple.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\src\pjlib-util\stun_simple_client.c"
+                                >
                         </File>
                         <File
@@ -537 +501 @@
                         </File>
                         <File
-                                RelativePath="..\include\pjlib-util\stun.h"
+                                RelativePath="..\include\pjlib-util\stun_simple.h"
                                 >
                         </File>