ChangeLogTag: Fri May 09 16:53:10 2003 Simon McQueen <sm@prismtechnologies.com>

16 files changed, 85 insertions, 61 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 949bc9a3d2b..79514c88da1 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,23 @@
+Fri May 09 16:53:10 2003  Simon McQueen  <sm@prismtechnologies.com>
+
+        * examples/PluggableUDP/tests/Basic/client.dsp:
+        * examples/PluggableUDP/tests/Basic/server.dsp:
+        * examples/PluggableUDP/tests/Performance/client.dsp:
+        * examples/PluggableUDP/tests/Performance/server.dsp:
+        * examples/PluggableUDP/tests/SimplePerformance/client.dsp:
+        * examples/PluggableUDP/tests/SimplePerformance/server.dsp:
+        * examples/Simple/time/client_static.dsp:
+        * examples/Simple/time/server_static.dsp:
+        * orbsvcs/Event_Service/Event_Service_static.dsp:
+        * orbsvcs/LoadBalancer/LoadManager_Static.dsp:
+        * orbsvcs/LoadBalancer/LoadMonitor_Static.dsp:
+        * orbsvcs/Naming_Service/Naming_Server_static.dsp:
+        * orbsvcs/tests/Notify/Driver/Driver_Static.dsp:
+        * performance-tests/Cubit/TAO/DII_Cubit/client.dsp:
+        * performance-tests/Cubit/TAO/IDL_Cubit/server.dsp:
+
+          Fixed static build errors from TAO subsetting.
+
 Fri May  9 10:42:37 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * tao/Any.cpp:
@@ -19,6 +39,7 @@ Fri May  9 12:41:33 UTC 2003  Johnny Willemsen  <jwillemsen@remedy.nl>
         * examples/AMH/Sink_Server/client.bor:
           Fixed these BCB makefiles
 
+>>>>>>> 1.1738
 Fri May 09 10:17:47 2003  Simon McQueen  <sm@prismtechnologies.com>
 
         * docs/tutorials/Quoter/AMI/client.dsp:
diff --git a/TAO/examples/PluggableUDP/tests/Basic/client.dsp b/TAO/examples/PluggableUDP/tests/Basic/client.dsp
index b6bcdff599f..29c2047c58c 100644
--- a/TAO/examples/PluggableUDP/tests/Basic/client.dsp
+++ b/TAO/examples/PluggableUDP/tests/Basic/client.dsp
@@ -179,7 +179,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer"

-# ADD LINK32 TAOs.lib aces.lib TAO_PortableServers.lib TAO_Strategiess.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\Strategies"

+# ADD LINK32 TAO_ObjRefTemplates.lib TAO_Valuetypes.lib TAO_IORInterceptors.lib TAOs.lib aces.lib TAO_PortableServers.lib TAO_Strategiess.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\Strategies"

 

 !ELSEIF  "$(CFG)" == "UDP Basic Client - Win32 Static Debug"

 

@@ -208,7 +208,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer"

-# ADD LINK32 TAOsd.lib acesd.lib TAO_PortableServersd.lib TAO_Strategiessd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\Strategies"

+# ADD LINK32 TAO_ObjRefTemplatesd.lib TAO_Valuetypesd.lib TAO_IORInterceptorsd.lib TAOsd.lib acesd.lib TAO_PortableServersd.lib TAO_Strategiessd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\Strategies"

 

 !ENDIF 

 

diff --git a/TAO/examples/PluggableUDP/tests/Basic/server.dsp b/TAO/examples/PluggableUDP/tests/Basic/server.dsp
index 8493933fdc6..8d7d0780f9b 100644
--- a/TAO/examples/PluggableUDP/tests/Basic/server.dsp
+++ b/TAO/examples/PluggableUDP/tests/Basic/server.dsp
@@ -170,7 +170,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer"

-# ADD LINK32 TAOs.lib aces.lib TAO_PortableServers.lib TAO_Strategiess.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\Strategies"

+# ADD LINK32 TAO_ObjRefTemplates.lib TAO_Valuetypes.lib TAO_IORInterceptors.lib TAOs.lib aces.lib TAO_PortableServers.lib TAO_Strategiess.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\Strategies"

 # SUBTRACT LINK32 /map

 

 !ELSEIF  "$(CFG)" == "UDP Basic Server - Win32 Static Debug"

@@ -200,7 +200,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer"

-# ADD LINK32 TAOsd.lib acesd.lib TAO_PortableServersd.lib TAO_Strategiessd.lib advapi32.lib user32.lib /nologo /subsystem:console /map /debug /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\Strategies"

+# ADD LINK32 TAO_ObjRefTemplatesd.lib TAO_Valuetypesd.lib TAO_IORInterceptorsd.lib TAOsd.lib acesd.lib TAO_PortableServersd.lib TAO_Strategiessd.lib advapi32.lib user32.lib /nologo /subsystem:console /map /debug /machine:I386 /libpath:"..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\Strategies"

 

 !ENDIF 

 

diff --git a/TAO/examples/PluggableUDP/tests/Performance/client.dsp b/TAO/examples/PluggableUDP/tests/Performance/client.dsp
index c4b3ba675d3..9299176edd2 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/client.dsp
+++ b/TAO/examples/PluggableUDP/tests/Performance/client.dsp
@@ -56,7 +56,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_Strategies.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\Strategies"

+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_Strategies.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\tao\Strategies" /libpath:"..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer"

 

 !ELSEIF  "$(CFG)" == "UDP Performance Client - Win32 Debug"

 

@@ -83,7 +83,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_Strategiesd.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\Strategies"

+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_Strategiesd.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\tao\Strategies" /libpath:"..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer"

 

 !ELSEIF  "$(CFG)" == "UDP Performance Client - Win32 Alpha Debug"

 

@@ -112,7 +112,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 aced.lib TAOd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

-# ADD LINK32 aced.lib TAOd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao\PortableServer"

+# ADD LINK32 aced.lib TAOd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer"

 

 !ELSEIF  "$(CFG)" == "UDP Performance Client - Win32 Alpha Release"

 

@@ -141,7 +141,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 ace.lib TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

-# ADD LINK32 ace.lib TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao\PortableServer"

+# ADD LINK32 ace.lib TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer"

 

 !ELSEIF  "$(CFG)" == "UDP Performance Client - Win32 Static Debug"

 

@@ -170,7 +170,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer"

-# ADD LINK32 TAOsd.lib acesd.lib TAO_PortableServersd.lib TAO_Strategiessd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\Strategies"

+# ADD LINK32 TAO_ObjRefTemplatesd.lib TAO_Valuetypesd.lib TAO_IORInterceptorsd.lib TAOsd.lib acesd.lib TAO_PortableServersd.lib TAO_Strategiessd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\tao\Strategies" /libpath:"..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer"

 

 !ELSEIF  "$(CFG)" == "UDP Performance Client - Win32 Static Release"

 

@@ -199,7 +199,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer"

-# ADD LINK32 TAOs.lib aces.lib TAO_PortableServers.lib TAO_Strategiess.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\Strategies"

+# ADD LINK32 TAO_ObjRefTemplates.lib TAO_Valuetypes.lib TAO_IORInterceptors.lib TAOs.lib aces.lib TAO_PortableServers.lib TAO_Strategiess.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\tao\Strategies" /libpath:"..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer"

 

 !ENDIF 

 

diff --git a/TAO/examples/PluggableUDP/tests/Performance/server.dsp b/TAO/examples/PluggableUDP/tests/Performance/server.dsp
index 33d52fa40d4..71ca13eb8ff 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/server.dsp
+++ b/TAO/examples/PluggableUDP/tests/Performance/server.dsp
@@ -56,7 +56,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_Strategies.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\Strategies"

+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_Strategies.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\tao\Strategies" /libpath:"..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer"

 

 !ELSEIF  "$(CFG)" == "UDP Performance Server - Win32 Debug"

 

@@ -83,7 +83,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_Strategiesd.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\Strategies"

+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_Strategiesd.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\tao\Strategies" /libpath:"..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer"

 

 !ELSEIF  "$(CFG)" == "UDP Performance Server - Win32 Alpha Debug"

 

@@ -112,7 +112,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 aced.lib TAOd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

-# ADD LINK32 aced.lib TAOd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao\PortableServer"

+# ADD LINK32 aced.lib TAOd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\Strategies"

 

 !ELSEIF  "$(CFG)" == "UDP Performance Server - Win32 Alpha Release"

 

@@ -141,7 +141,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 ace.lib TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

-# ADD LINK32 ace.lib TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao\PortableServer"

+# ADD LINK32 ace.lib TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\Strategies"

 

 !ELSEIF  "$(CFG)" == "UDP Performance Server - Win32 Static Debug"

 

@@ -170,7 +170,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer"

-# ADD LINK32 TAOsd.lib acesd.lib TAO_PortableServersd.lib TAO_Strategiessd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\Strategies"

+# ADD LINK32 TAO_ObjRefTemplatesd.lib TAO_Valuetypesd.lib TAO_IORInterceptorsd.lib TAOsd.lib acesd.lib TAO_PortableServersd.lib TAO_Strategiessd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\tao\Strategies" /libpath:"..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer"

 

 !ELSEIF  "$(CFG)" == "UDP Performance Server - Win32 Static Release"

 

@@ -198,7 +198,7 @@ BSC32=bscmake.exe
 LINK32=link.exe

 # ADD BASE LINK32 aced.lib TAOd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao\PortableServer"

 # SUBTRACT BASE LINK32 /incremental:no

-# ADD LINK32 TAOs.lib aces.lib TAO_PortableServers.lib TAO_Strategiess.lib advapi32.lib user32.lib /nologo /subsystem:console /incremental:no /machine:IX86 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\Strategies"

+# ADD LINK32 TAO_ObjRefTemplates.lib TAO_Valuetypes.lib TAO_IORInterceptors.lib TAOs.lib aces.lib TAO_PortableServers.lib TAO_Strategiess.lib advapi32.lib user32.lib /nologo /subsystem:console /incremental:no /machine:IX86 /libpath:"..\..\..\..\tao\Strategies" /libpath:"..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer"

 # SUBTRACT LINK32 /debug

 

 !ENDIF 

diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.dsp b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.dsp
index 9e1deaca043..d211aa2fcb9 100644
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.dsp
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib TAO_Strategies.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\Strategies"

+# ADD LINK32 ace.lib TAO.lib TAO_Strategies.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\Strategies"

 

 !ELSEIF  "$(CFG)" == "Simple Performance Client - Win32 Debug"

 

@@ -78,7 +78,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAOd.lib TAO_Strategiesd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\Strategies"

+# ADD LINK32 aced.lib TAOd.lib TAO_Strategiesd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\Strategies"

 

 !ELSEIF  "$(CFG)" == "Simple Performance Client - Win32 Static Debug"

 

@@ -105,7 +105,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 aced.lib TAOd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao"

-# ADD LINK32 TAOsd.lib acesd.lib TAO_Strategiessd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\Strategies"

+# ADD LINK32 TAO_ObjRefTemplatesd.lib TAO_Valuetypesd.lib TAO_IORInterceptorsd.lib TAOsd.lib acesd.lib TAO_Strategiessd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\Strategies"

 

 !ELSEIF  "$(CFG)" == "Simple Performance Client - Win32 Static Release"

 

@@ -131,7 +131,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 ace.lib TAO.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao"

-# ADD LINK32 TAOs.lib aces.lib TAO_Strategiess.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\Strategies"

+# ADD LINK32 TAO_ObjRefTemplates.lib TAO_Valuetypes.lib TAO_IORInterceptors.lib TAOs.lib aces.lib TAO_Strategiess.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\Strategies"

 

 !ENDIF 

 

diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/server.dsp b/TAO/examples/PluggableUDP/tests/SimplePerformance/server.dsp
index 47b1e5b434d..1cbb415aa5a 100644
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/server.dsp
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/server.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_Strategies.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\Strategies"

+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_Strategies.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao\ObjRefTemplate" /libpath:"..\..\tao\Valuetype" /libpath:"..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\Strategies" /libpath:"..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\tao\IORInterceptor"

 

 !ELSEIF  "$(CFG)" == "Simple Performance Server - Win32 Debug"

 

@@ -78,7 +78,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_Strategiesd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\Strategies"

+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_Strategiesd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\tao\ObjRefTemplate" /libpath:"..\..\tao\Valuetype" /libpath:"..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\Strategies" /libpath:"..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\tao\IORInterceptor"

 

 !ELSEIF  "$(CFG)" == "Simple Performance Server - Win32 Static Debug"

 

@@ -105,7 +105,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer"

-# ADD LINK32 TAOsd.lib acesd.lib TAO_PortableServersd.lib TAO_Strategiessd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\Strategies"

+# ADD LINK32 TAO_ObjRefTemplatesd.lib TAO_Valuetypesd.lib TAO_IORInterceptorsd.lib TAOsd.lib acesd.lib TAO_PortableServersd.lib TAO_Strategiessd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\Strategies"

 

 !ELSEIF  "$(CFG)" == "Simple Performance Server - Win32 Static Release"

 

@@ -131,7 +131,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer"

-# ADD LINK32 TAOs.lib aces.lib TAO_PortableServers.lib TAO_Strategiess.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\Strategies"

+# ADD LINK32 TAO_ObjRefTemplates.lib TAO_Valuetypes.lib TAO_IORInterceptors.lib TAOs.lib aces.lib TAO_PortableServers.lib TAO_Strategiess.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\Strategies"

 

 !ENDIF 

 

diff --git a/TAO/examples/Simple/time/client_static.dsp b/TAO/examples/Simple/time/client_static.dsp
index 548483587e0..1ca6458a520 100644
--- a/TAO/examples/Simple/time/client_static.dsp
+++ b/TAO/examples/Simple/time/client_static.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 aced.lib TAOd.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\tao" /libpath:"..\..\..\ace"

-# ADD LINK32 user32.lib advapi32.lib acesd.lib TAO_IORTablesd.lib TAO_PortableServersd.lib TAOsd.lib TAO_CosNamingsd.lib TAO_Svc_Utilssd.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\iortable" /libpath:"..\..\..\tao\portableserver" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\orbsvcs\orbsvcs"

+# ADD LINK32 user32.lib advapi32.lib acesd.lib TAO_IORTablesd.lib TAO_PortableServersd.lib TAOsd.lib TAO_CosNamingsd.lib TAO_Svc_Utilssd.lib TAO_ObjRefTemplatesd.lib TAO_Valuetypesd.lib TAO_IORInterceptorsd.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\tao\iortable" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\portableserver" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\tao\Valuetype" /libpath:"..\..\..\tao\IORInterceptor"

 

 !ELSEIF  "$(CFG)" == "Simple Time Client Static - Win32 Static Release"

 

@@ -80,7 +80,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 ace.lib TAO.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao" /libpath:"..\..\..\ace"

-# ADD LINK32 TAO_CosNamings.lib TAO_Svc_Utilss.lib TAO_IORTables.lib TAO_PortableServers.lib TAOs.lib aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\IORTable" /libpath:"..\..\..\tao\portableserver" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\orbsvcs\orbsvcs"

+# ADD LINK32 TAO_CosNamings.lib TAO_Svc_Utilss.lib TAO_IORTables.lib TAO_PortableServers.lib TAOs.lib TAO_ObjRefTemplates.lib TAO_Valuetypes.lib TAO_IORInterceptors.lib aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\IORTable" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\portableserver" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\tao\Valuetype" /libpath:"..\..\..\tao\IORInterceptor"

 

 !ENDIF 

 

diff --git a/TAO/examples/Simple/time/server_static.dsp b/TAO/examples/Simple/time/server_static.dsp
index 90a5fb9ed08..33ad186cc53 100644
--- a/TAO/examples/Simple/time/server_static.dsp
+++ b/TAO/examples/Simple/time/server_static.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 aced.lib TAOd.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\tao" /libpath:"..\..\..\ace"

-# ADD LINK32 user32.lib advapi32.lib acesd.lib TAO_IORTablesd.lib TAO_PortableServersd.lib TAOsd.lib TAO_CosNamingsd.lib TAO_Svc_Utilssd.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\iortable" /libpath:"..\..\..\tao\portableserver" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\orbsvcs\orbsvcs"

+# ADD LINK32 user32.lib advapi32.lib acesd.lib TAO_IORTablesd.lib TAO_PortableServersd.lib TAOsd.lib TAO_CosNamingsd.lib TAO_Svc_Utilssd.lib TAO_ObjRefTemplatesd.lib TAO_Valuetypesd.lib TAO_IORInterceptorsd.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\tao\iortable" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\portableserver" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\tao\Valuetype" /libpath:"..\..\..\tao\IORInterceptor"

 

 !ELSEIF  "$(CFG)" == "Simple Time Server Static - Win32 Static Release"

 

@@ -80,7 +80,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 ace.lib TAO.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao" /libpath:"..\..\..\ace"

-# ADD LINK32 TAO_CosNamings.lib TAO_Svc_Utilss.lib TAO_IORTables.lib TAO_PortableServers.lib TAOs.lib aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\IORTable" /libpath:"..\..\..\tao\portableserver" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\orbsvcs\orbsvcs"

+# ADD LINK32 TAO_CosNamings.lib TAO_Svc_Utilss.lib TAO_IORTables.lib TAO_PortableServers.lib TAOs.lib TAO_ObjRefTemplates.lib TAO_Valuetypes.lib TAO_IORInterceptors.lib aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\IORTable" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\portableserver" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\tao\Valuetype" /libpath:"..\..\..\tao\IORInterceptor"

 

 !ENDIF 

 

diff --git a/TAO/orbsvcs/Event_Service/Event_Service_static.dsp b/TAO/orbsvcs/Event_Service/Event_Service_static.dsp
index 9036d805642..5e551958157 100644
--- a/TAO/orbsvcs/Event_Service/Event_Service_static.dsp
+++ b/TAO/orbsvcs/Event_Service/Event_Service_static.dsp
@@ -52,7 +52,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 TAOs.lib aces.lib TAO_CosNamings.lib TAO_RTEvents.lib TAO_RTOLDEvents.lib TAO_RTScheds.lib /nologo /subsystem:console /machine:I386 /out:"..\orbsvcs,..\..\tao,..\..\..\ace"

-# ADD LINK32 TAOs.lib aces.lib TAO_PortableServers.lib TAO_Svc_Utilss.lib TAO_CosNamings.lib TAO_RTEvents.lib TAO_RTOLDEvents.lib TAO_RTScheds.lib user32.lib advapi32.lib TAO_Messagings.lib /nologo /subsystem:console /machine:I386 /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\TAO\PORTABLESERVER" /libpath:"..\..\tao\Messaging"

+# ADD LINK32  TAO_ObjRefTemplates.lib TAO_Valuetypes.lib TAO_IORInterceptors.lib TAOs.lib aces.lib TAO_PortableServers.lib TAO_Svc_Utilss.lib TAO_CosNamings.lib TAO_RTEvents.lib TAO_RTOLDEvents.lib TAO_RTScheds.lib user32.lib advapi32.lib TAO_Messagings.lib /nologo /subsystem:console /machine:I386 /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\TAO\PORTABLESERVER" /libpath:"..\..\tao\Messaging" /libpath:"..\..\tao\ObjRefTemplate" /libpath:"..\..\tao\Valuetype" /libpath:"..\..\tao\IORInterceptor"

 

 !ELSEIF  "$(CFG)" == "Event_Service_static - Win32 Static Debug"

 

@@ -78,7 +78,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 TAOsd.lib acesd.lib TAO_CosNamingsd.lib TAO_RTEventsd.lib TAO_RTOLDEventsd.lib TAO_RTSchedsd.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\orbsvcs,..\..\tao,..\..\..\ace" /pdbtype:sept

-# ADD LINK32 TAOsd.lib acesd.lib TAO_PortableServersd.lib TAO_Svc_Utilssd.lib TAO_CosNamingsd.lib TAO_RTEventsd.lib TAO_RTOLDEventsd.lib TAO_RTSchedsd.lib user32.lib advapi32.lib TAO_Messagingsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\TAO\PORTABLESERVER" /libpath:"..\..\tao\Messaging"

+# ADD LINK32 TAO_ObjRefTemplatesd.lib TAO_Valuetypesd.lib TAO_IORInterceptorsd.lib TAOsd.lib acesd.lib TAO_PortableServersd.lib TAO_Svc_Utilssd.lib TAO_CosNamingsd.lib TAO_RTEventsd.lib TAO_RTOLDEventsd.lib TAO_RTSchedsd.lib user32.lib advapi32.lib TAO_Messagingsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\TAO\PORTABLESERVER" /libpath:"..\..\tao\Messaging" /libpath:"..\..\tao\ObjRefTemplate" /libpath:"..\..\tao\Valuetype" /libpath:"..\..\tao\IORInterceptor"

 

 !ENDIF 

 

diff --git a/TAO/orbsvcs/LoadBalancer/LoadManager_Static.dsp b/TAO/orbsvcs/LoadBalancer/LoadManager_Static.dsp
index 34ac6397e34..d57e5b62af5 100644
--- a/TAO/orbsvcs/LoadBalancer/LoadManager_Static.dsp
+++ b/TAO/orbsvcs/LoadBalancer/LoadManager_Static.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 TAOs.lib TAO_CosLoadBalancings.lib TAO_PortableGroups.lib TAO_Messagings.lib TAO_CosNamings.lib TAO_Svc_Utilss.lib TAO_PortableServers.lib aces.lib TAO_Valuetypes.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\tao\portableserver" /libpath:"..\..\tao\Messaging" /libpath:"..\..\tao\Valuetype"

+# ADD LINK32 TAO_IORInterceptors.lib TAOs.lib TAO_CosLoadBalancings.lib TAO_PortableGroups.lib TAO_Messagings.lib TAO_CosNamings.lib TAO_Svc_Utilss.lib TAO_PortableServers.lib aces.lib TAO_Valuetypes.lib TAO_ObjRefTemplates.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\tao\portableserver" /libpath:"..\..\tao\Messaging" /libpath:"..\..\tao\Valuetype" /libpath:"..\..\tao\ObjRefTemplate" /libpath:"..\..\tao\IORInterceptor"

 

 !ELSEIF  "$(CFG)" == "LoadManager_Static - Win32 Static Debug"

 

@@ -76,7 +76,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 TAOsd.lib acesd.lib TAO_CosLoadBalancingsd.lib TAO_PortableGroupsd.lib TAO_Messagingsd.lib TAO_CosNamingsd.lib TAO_Svc_Utilssd.lib TAO_PortableServersd.lib TAO_Valuetypesd.lib user32.lib advapi32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\tao\portableserver" /libpath:"..\..\tao\Messaging" /libpath:"..\..\tao\Valuetype"

+# ADD LINK32 TAO_IORInterceptorsd.lib TAO_ObjRefTemplatesd.lib TAOsd.lib acesd.lib TAO_CosLoadBalancingsd.lib TAO_PortableGroupsd.lib TAO_Messagingsd.lib TAO_CosNamingsd.lib TAO_Svc_Utilssd.lib TAO_PortableServersd.lib TAO_Valuetypesd.lib user32.lib advapi32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\tao\portableserver" /libpath:"..\..\tao\Messaging" /libpath:"..\..\tao\Valuetype" /libpath:"..\..\tao\ObjRefTemplate" /libpath:"..\..\tao\IORInterceptor"

 # SUBTRACT LINK32 /nodefaultlib

 

 !ENDIF 

diff --git a/TAO/orbsvcs/LoadBalancer/LoadMonitor_Static.dsp b/TAO/orbsvcs/LoadBalancer/LoadMonitor_Static.dsp
index 8b77efbec22..9a4b8bb8b16 100644
--- a/TAO/orbsvcs/LoadBalancer/LoadMonitor_Static.dsp
+++ b/TAO/orbsvcs/LoadBalancer/LoadMonitor_Static.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 TAOs.lib TAO_CosLoadBalancings.lib TAO_PortableGroups.lib TAO_Messagings.lib TAO_CosNamings.lib TAO_Svc_Utilss.lib TAO_PortableServers.lib aces.lib TAO_Valuetypes.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\tao\portableserver" /libpath:"..\..\tao\Messaging" /libpath:"..\..\tao\Valuetype"

+# ADD LINK32 TAOs.lib TAO_CosLoadBalancings.lib TAO_IORInterceptors.lib TAO_PortableGroups.lib TAO_Messagings.lib TAO_CosNamings.lib TAO_Svc_Utilss.lib TAO_PortableServers.lib aces.lib TAO_Valuetypes.lib TAO_ObjRefTemplates.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\tao\portableserver" /libpath:"..\..\tao\Messaging" /libpath:"..\..\tao\Valuetype" /libpath:"..\..\tao\IORInterceptor" /libpath:"..\..\tao\ObjRefTemplate"

 

 !ELSEIF  "$(CFG)" == "LoadMonitor_Static - Win32 Static Debug"

 

@@ -76,7 +76,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 TAOsd.lib acesd.lib TAO_CosLoadBalancingsd.lib TAO_PortableGroupsd.lib TAO_Messagingsd.lib TAO_CosNamingsd.lib TAO_Svc_Utilssd.lib TAO_PortableServersd.lib TAO_Valuetypesd.lib user32.lib advapi32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\tao\portableserver" /libpath:"..\..\tao\Messaging" /libpath:"..\..\tao\Valuetype"

+# ADD LINK32 TAOsd.lib acesd.lib TAO_ObjRefTemplatesd.lib TAO_CosLoadBalancingsd.lib TAO_PortableGroupsd.lib TAO_Messagingsd.lib TAO_CosNamingsd.lib TAO_Svc_Utilssd.lib TAO_PortableServersd.lib TAO_Valuetypesd.lib TAO_IORInterceptorsd.lib user32.lib advapi32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\tao\portableserver" /libpath:"..\..\tao\Messaging" /libpath:"..\..\tao\Valuetype" /libpath:"..\..\tao\IORInterceptor" /libpath:"..\..\tao\ObjRefTemplate"

 # SUBTRACT LINK32 /nodefaultlib

 

 !ENDIF 

diff --git a/TAO/orbsvcs/Naming_Service/Naming_Server_static.dsp b/TAO/orbsvcs/Naming_Service/Naming_Server_static.dsp
index 59ba97e122b..b4f16a57944 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Server_static.dsp
+++ b/TAO/orbsvcs/Naming_Service/Naming_Server_static.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 TAOs.lib TAO_CosNamings.lib TAO_Svc_Utilss.lib TAO_PortableServers.lib TAO_IORTables.lib aces.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\tao\portableserver" /libpath:"..\..\tao\iortable"

+# ADD LINK32 TAOs.lib TAO_CosNamings.lib TAO_Svc_Utilss.lib TAO_PortableServers.lib TAO_IORTables.lib aces.lib TAO_ObjRefTemplates.lib TAO_Valuetypes.lib TAO_IORInterceptors.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\tao\portableserver" /libpath:"..\..\tao\iortable" /libpath:"..\..\tao\ObjRefTemplate" /libpath:"..\..\tao\Valuetype" /libpath:"..\..\tao\IORInterceptor"

 

 !ELSEIF  "$(CFG)" == "Naming Service Static - Win32 Static Debug"

 

@@ -76,7 +76,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 TAOsd.lib acesd.lib TAO_CosNamingsd.lib TAO_Svc_Utilssd.lib TAO_PortableServersd.lib TAO_IORTablesd.lib user32.lib advapi32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\tao\portableserver" /libpath:"..\..\tao\iortable"

+# ADD LINK32 TAOsd.lib acesd.lib TAO_CosNamingsd.lib TAO_Svc_Utilssd.lib TAO_PortableServersd.lib TAO_IORTablesd.lib TAO_ObjRefTemplatesd.lib TAO_Valuetypesd.lib TAO_IORInterceptorsd.lib user32.lib advapi32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\tao\portableserver" /libpath:"..\..\tao\iortable" /libpath:"..\..\tao\ObjRefTemplate" /libpath:"..\..\tao\Valuetype" /libpath:"..\..\tao\IORInterceptor"

 # SUBTRACT LINK32 /nodefaultlib

 

 !ENDIF 

diff --git a/TAO/orbsvcs/tests/Notify/Driver/Driver_Static.dsp b/TAO/orbsvcs/tests/Notify/Driver/Driver_Static.dsp
index 11d776009ff..9afc0747208 100644
--- a/TAO/orbsvcs/tests/Notify/Driver/Driver_Static.dsp
+++ b/TAO/orbsvcs/tests/Notify/Driver/Driver_Static.dsp
@@ -6,21 +6,20 @@
 

 CFG=Driver Static EXE - Win32 Static Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE run the tool that generated this project file and specify the

-!MESSAGE nmake output type.  You can then use the following command:

-!MESSAGE

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

 !MESSAGE NMAKE /f "Driver_Static.mak".

-!MESSAGE

+!MESSAGE 

 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE

+!MESSAGE 

 !MESSAGE NMAKE /f "Driver_Static.mak" CFG="Driver Static EXE - Win32 Static Debug"

-!MESSAGE

+!MESSAGE 

 !MESSAGE Possible choices for configuration are:

-!MESSAGE

+!MESSAGE 

 !MESSAGE "Driver Static EXE - Win32 Static Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Driver Static EXE - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE

+!MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

@@ -36,13 +35,15 @@ RSC=rc.exe
 # PROP Output_Dir "Static_Release"

 # PROP Intermediate_Dir "Static_Release"

 # PROP Target_Dir ""

-# ADD CPP /nologo /W3 /GX /O2 /MD /GR /I "..\..\..\..\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\tao" /I "..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _CONSOLE=1 /D TAO_AS_STATIC_LIBS=1 /D ACE_AS_STATIC_LIBS=1 /FD /c

+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "..\..\..\..\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\tao" /I "..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _CONSOLE=1 /D TAO_AS_STATIC_LIBS=1 /D ACE_AS_STATIC_LIBS=1 /FD /c

 # SUBTRACT CPP /YX

-# ADD RSC /l 0x409 /d NDEBUG=1 /i "..\..\..\..\orbsvcs" /i "..\..\..\.." /i "..\..\..\..\tao" /i "..\..\..\..\.."

+# ADD BASE RSC /l 0x809

+# ADD RSC /l 0x409 /i "..\..\..\..\orbsvcs" /i "..\..\..\.." /i "..\..\..\..\tao" /i "..\..\..\..\.." /d NDEBUG=1

 BSC32=bscmake.exe

-# ADD BSC32 /nologo 

+# ADD BSC32 /nologo

 LINK32=link.exe

-# ADD LINK32 advapi32.lib user32.lib /INCREMENTAL:NO TAO_NotifyTestss.lib TAOs.lib ACEs.lib /libpath:"..\..\..\..\tao\IORTable" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\DynamicAny" /libpath:"..\..\..\..\orbsvcs\orbsvcs\ETCL" /libpath:"..\..\..\..\orbsvcs\tests\Notify\lib" /libpath:"..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /nologo /version:1.3.1 /subsystem:console  /machine:I386 /out:"Notify_Tests_Driver.exe"

+# ADD BASE LINK32 /machine:IX86

+# ADD LINK32 advapi32.lib user32.lib TAO_Cosnamings.lib TAO_CosNotifications.lib TAO_NotifyTestss.lib TAOs.lib ACEs.lib TAO_PortableServers.lib  TAO_CosEvents.lib TAO_Svc_Utilss.lib  TAO_ObjRefTemplates.lib TAO_Valuetypes.lib TAO_IORInterceptors.lib /nologo /subsystem:console /machine:I386 /out:"Notify_Tests_Driver.exe" /libpath:"..\..\..\..\tao\IORTable" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\DynamicAny" /libpath:"..\..\..\..\orbsvcs\orbsvcs\ETCL" /libpath:"..\..\..\..\orbsvcs\tests\Notify\lib" /libpath:"..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\tao\IORInterceptor" /version:1.3.1

 

 !ELSEIF  "$(CFG)" == "Driver Static EXE - Win32 Static Debug"

 

@@ -51,15 +52,17 @@ LINK32=link.exe
 # PROP Output_Dir "Static_Debug"

 # PROP Intermediate_Dir "Static_Debug"

 # PROP Target_Dir ""

-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /MDd /GR /Gy /I "..\..\..\..\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\tao" /I "..\..\..\..\.." /D _DEBUG=1 /D WIN32=1 /D _CONSOLE=1 /D TAO_AS_STATIC_LIBS=1 /D ACE_AS_STATIC_LIBS=1 /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /Gy /I "..\..\..\..\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\tao" /I "..\..\..\..\.." /D _DEBUG=1 /D WIN32=1 /D _CONSOLE=1 /D TAO_AS_STATIC_LIBS=1 /D ACE_AS_STATIC_LIBS=1 /FD /c

 # SUBTRACT CPP /YX

-# ADD RSC /l 0x409 /d _DEBUG=1 /i "..\..\..\..\orbsvcs" /i "..\..\..\.." /i "..\..\..\..\tao" /i "..\..\..\..\.."

+# ADD BASE RSC /l 0x809

+# ADD RSC /l 0x409 /i "..\..\..\..\orbsvcs" /i "..\..\..\.." /i "..\..\..\..\tao" /i "..\..\..\..\.." /d _DEBUG=1

 BSC32=bscmake.exe

-# ADD BSC32 /nologo 

+# ADD BSC32 /nologo

 LINK32=link.exe

-# ADD LINK32 advapi32.lib user32.lib /INCREMENTAL:NO TAO_NotifyTestssd.lib TAOsd.lib ACEsd.lib /libpath:"..\..\..\..\tao\IORTable" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\DynamicAny" /libpath:"..\..\..\..\orbsvcs\orbsvcs\ETCL" /libpath:"..\..\..\..\orbsvcs\tests\Notify\lib" /libpath:"..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /nologo /version:1.3.1 /subsystem:console /debug /machine:I386 /out:"Notify_Tests_Driver.exe"

+# ADD BASE LINK32 /machine:IX86

+# ADD LINK32 advapi32.lib user32.lib TAO_Cosnamingsd.lib TAO_CosNotificationsd.lib TAO_NotifyTestssd.lib TAOsd.lib ACEsd.lib TAO_PortableServersd.lib TAO_CosEventsd.lib TAO_Svc_Utilssd.lib TAO_ObjRefTemplatesd.lib TAO_Valuetypesd.lib TAO_IORInterceptorsd.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"Notify_Tests_Driver.exe" /libpath:"..\..\..\..\tao\IORTable" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\DynamicAny" /libpath:"..\..\..\..\orbsvcs\orbsvcs\ETCL" /libpath:"..\..\..\..\orbsvcs\tests\Notify\lib" /libpath:"..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\tao\IORInterceptor" /version:1.3.1

 

-!ENDIF

+!ENDIF 

 

 # Begin Target

 

diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.dsp b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.dsp
index 2c957952e06..44ffb0563d7 100644
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.dsp
+++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 TAO_Strategies.lib TAO_DynamicInterface.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\tao\Strategies" /libpath:"..\..\..\..\tao\DynamicInterface" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\orbsvcs\orbsvcs"

+# ADD LINK32 TAO_Strategies.lib TAO_DynamicInterface.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\tao\Strategies" /libpath:"..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\tao\DynamicInterface" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\tao\PortableServer"

 

 !ELSEIF  "$(CFG)" == "DII_Cubit Client - Win32 Debug"

 

@@ -78,7 +78,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 TAO_DynamicInterfaced.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\tao\DynamicInterface" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\orbsvcs\orbsvcs"

+# ADD LINK32 TAO_DynamicInterfaced.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\tao\DynamicInterface" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\tao\PortableServer"

 

 !ELSEIF  "$(CFG)" == "DII_Cubit Client - Win32 Static Debug"

 

@@ -105,7 +105,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 aced.lib TAOd.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

-# ADD LINK32 TAO_DynamicInterfacesd.lib TAOsd.lib acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\tao\DynamicInterface" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

+# ADD LINK32 TAO_PortableServersd.lib TAO_DynamicInterfacesd.lib TAOsd.lib acesd.lib TAO_ObjRefTemplatesd.lib TAO_Valuetypesd.lib TAO_IORInterceptorsd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\tao\DynamicInterface" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\tao\PortableServer"

 

 !ELSEIF  "$(CFG)" == "DII_Cubit Client - Win32 Static Release"

 

@@ -132,7 +132,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 ace.lib TAO.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

-# ADD LINK32 TAO_DynamicInterfaces.lib TAOs.lib aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\tao\DynamicInterface" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

+# ADD LINK32 TAO_PortableServers.lib TAO_DynamicInterfaces.lib TAOs.lib aces.lib TAO_ObjRefTemplates.lib TAO_Valuetypes.lib TAO_IORInterceptors.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\tao\DynamicInterface" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\tao\PortableServer"

 

 !ENDIF 

 

diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.dsp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.dsp
index 02e9079689b..5478821b031 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.dsp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 TAO.lib ace.lib TAO_PortableServer.lib TAO_Strategies.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\Strategies" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

+# ADD LINK32 TAO.lib ace.lib TAO_PortableServer.lib TAO_Strategies.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao\ObjRefTemplate" /libpath:"..\..\tao\Valuetype" /libpath:"..\..\tao\IORInterceptor" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\Strategies" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\tao\IORInterceptor"

 

 !ELSEIF  "$(CFG)" == "IDL_Cubit Server - Win32 Debug"

 

@@ -78,7 +78,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 TAOd.lib aced.lib TAO_PortableServerd.lib TAO_Strategiesd.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\Strategies" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

+# ADD LINK32 TAOd.lib aced.lib TAO_PortableServerd.lib TAO_Strategiesd.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\tao\ObjRefTemplate" /libpath:"..\..\tao\Valuetype" /libpath:"..\..\tao\IORInterceptor" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\Strategies" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\tao\IORInterceptor"

 

 !ELSEIF  "$(CFG)" == "IDL_Cubit Server - Win32 Static Debug"

 

@@ -105,7 +105,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 aced.lib TAOd.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

-# ADD LINK32 TAOsd.lib acesd.lib TAO_PortableServersd.lib TAO_Strategiessd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\Strategies" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

+# ADD LINK32 TAOsd.lib acesd.lib TAO_PortableServersd.lib TAO_Strategiessd.lib TAO_ObjRefTemplatesd.lib TAO_Valuetypesd.lib TAO_IORInterceptorsd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\Strategies" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

 

 !ELSEIF  "$(CFG)" == "IDL_Cubit Server - Win32 Static Release"

 

@@ -132,7 +132,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 ace.lib TAO.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

-# ADD LINK32 TAOs.lib aces.lib TAO_PortableServers.lib TAO_Strategiess.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\Strategies" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

+# ADD LINK32 TAOs.lib aces.lib TAO_PortableServers.lib TAO_Strategiess.lib TAO_ObjRefTemplates.lib TAO_Valuetypes.lib TAO_IORInterceptors.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao\ObjRefTemplate" /libpath:"..\..\tao\Valuetype" /libpath:"..\..\tao\IORInterceptor" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\Strategies" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\tao\IORInterceptor"

 

 !ENDIF