Changeset 3052 for pjproject/trunk

Timestamp:

Jan 8, 2010 4:38:47 PM (15 years ago)

Author:

nanang

Message:

Ticket #1015: Disabled ioqueue Completion Port (ioqueue_winnt.c).

Location:

pjproject/trunk/pjlib/build

Files:

• os-win32.mak (modified) (1 diff)
• pjlib.dsp (modified) (1 diff)
• pjlib.vcproj (modified) (6 diffs)

pjproject/trunk/pjlib/build/os-win32.mak

@@ -14 +14 @@
                         pool_policy_malloc.o sock_bsd.o sock_select.o
 
-export PJLIB_OBJS +=    ioqueue_winnt.o
-#export PJLIB_OBJS +=   ioqueue_select.o
+#export PJLIB_OBJS +=   ioqueue_winnt.o
+export PJLIB_OBJS +=    ioqueue_select.o
 
 export PJLIB_OBJS +=    file_io_win32.o file_access_win32.o

pjproject/trunk/pjlib/build/pjlib.dsp

@@ -241 +241 @@
 
 SOURCE=..\src\pj\ioqueue_select.c
-
-!IF  "$(CFG)" == "pjlib - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "pjlib - Win32 Debug"
-
-!ENDIF 
-
 # End Source File
 # Begin Source File
 
 SOURCE=..\src\pj\ioqueue_winnt.c
-
-!IF  "$(CFG)" == "pjlib - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "pjlib - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
+# PROP Exclude_From_Build 1
 # End Source File
 # Begin Source File

pjproject/trunk/pjlib/build/pjlib.vcproj

@@ -4181 +4181 @@
                                 <FileConfiguration
                                         Name="Release|Win32"
-                                        ExcludedFromBuild="true"
                                         >
                                         <Tool
@@ -4200 +4199 @@
                                 <FileConfiguration
                                         Name="Release-Dynamic|Win32"
-                                        ExcludedFromBuild="true"
                                         >
                                         <Tool
@@ -4219 +4217 @@
                                 <FileConfiguration
                                         Name="Release-Static|Win32"
-                                        ExcludedFromBuild="true"
                                         >
                                         <Tool
@@ -4291 +4288 @@
                                 <FileConfiguration
                                         Name="Release|Win32"
+                                        ExcludedFromBuild="true"
                                         >
                                         <Tool
@@ -4406 +4404 @@
                                 <FileConfiguration
                                         Name="Release-Dynamic|Win32"
+                                        ExcludedFromBuild="true"
                                         >
                                         <Tool
@@ -4521 +4520 @@
                                 <FileConfiguration
                                         Name="Release-Static|Win32"
+                                        ExcludedFromBuild="true"
                                         >
                                         <Tool