summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2002-11-07 18:22:30 +0000
committernanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2002-11-07 18:22:30 +0000
commit9cda21a29634937b8363cc080ac2860280562088 (patch)
treef7ae058ca1c6c677cf4a0b559ee4ceb526b4991f
parentb95d4674148be9d725dc62cf0bf7014c900c3aa8 (diff)
downloadATCD-9cda21a29634937b8363cc080ac2860280562088.tar.gz
ChangeLogTag:Thu Nov 07 12:21:21 2002 Nanbor Wang <nanbor@cs.wustl.edu>
-rw-r--r--TAO/ChangeLog25
-rw-r--r--TAO/TAOACE.dsw3
-rw-r--r--TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.dsw2
-rw-r--r--TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Logging_Service.dsp14
-rw-r--r--TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.dsp6
-rw-r--r--TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.dsp8
-rw-r--r--TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.dsp6
-rw-r--r--TAO/orbsvcs/examples/Log/Basic/Client.dsp8
-rw-r--r--TAO/orbsvcs/examples/Log/Event/Log_CEC_Simple_Consumer.dsp10
-rw-r--r--TAO/orbsvcs/examples/Log/Event/Log_CEC_Simple_Supplier.dsp10
-rw-r--r--TAO/orbsvcs/examples/Log/Notify/Log_Notify_Simple_Consumer.dsp8
-rw-r--r--TAO/orbsvcs/examples/Log/Notify/Log_Notify_Simple_Supplier.dsp8
-rw-r--r--TAO/orbsvcs/examples/Log/RTEvent/Log_RTEvent_Simple_Consumer.dsp8
-rw-r--r--TAO/orbsvcs/examples/Log/RTEvent/Log_RTEvent_Simple_Supplier.dsp8
-rw-r--r--TAO/orbsvcs/orbsvcs/RTEventLog.dsp16
-rw-r--r--TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.dsp7
-rw-r--r--TAO/tests/IDL_Test/idl_test.dsp24
17 files changed, 105 insertions, 66 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 061656b0271..0fd05eb9f34 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,6 +1,25 @@
+Thu Nov 07 12:21:21 2002 Nanbor Wang <nanbor@cs.wustl.edu>
+
+ * TAOACE.dsw:
+ * orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.dsw:
+ * orbsvcs/Logging_Service/Basic_Logging_Service/Logging_Service.dsp:
+ * orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.dsp:
+ * orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.dsp:
+ * orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.dsp:
+ * orbsvcs/examples/Log/Basic/Client.dsp:
+ * orbsvcs/examples/Log/Event/Log_CEC_Simple_Consumer.dsp:
+ * orbsvcs/examples/Log/Event/Log_CEC_Simple_Supplier.dsp:
+ * orbsvcs/examples/Log/Notify/Log_Notify_Simple_Consumer.dsp:
+ * orbsvcs/examples/Log/Notify/Log_Notify_Simple_Supplier.dsp:
+ * orbsvcs/examples/Log/RTEvent/Log_RTEvent_Simple_Consumer.dsp:
+ * orbsvcs/examples/Log/RTEvent/Log_RTEvent_Simple_Supplier.dsp:
+ * orbsvcs/orbsvcs/RTEventLog.dsp:
+ * orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.dsp:
+ * tests/IDL_Test/idl_test.dsp: Fixed broken workspaces and projects.
+
Thu Nov 7 12:03:18 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
- * tao/Incoming_Mesage_Queue.cpp (duplicate): In duplicate () the
+ * tao/Incoming_Mesage_Queue.cpp (duplicate): In duplicate () the
copy constructor should be called instead of the plain
constructor. Thanks tp Simon McQueen <sm@prismtechnologies.com>
for pointing this out.
@@ -8,14 +27,14 @@ Thu Nov 7 12:03:18 2002 Balachandran Natarajan <bala@isis-server.isis.vanderb
Thu Nov 7 09:17:04 2002 Balachandran Natarajan <bala@cs.wustl.edu>
* utils/nslist/nsadd.cpp: Fixed a compile error caused undeclared
- variables.
+ variables.
Wed Nov 6 20:09:14 2002 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu>
* utils/nslist/nsadd.cpp: Enhanced the utilty so that it can add
arbitrary paths to Naming Service entries. Thanks to Paul
Caffrey <denginere@hotmail.com> for this fix.
-
+
Thu Nov 7 06:44:12 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl>
* orbsvcs/tests/Makefile.bor:
diff --git a/TAO/TAOACE.dsw b/TAO/TAOACE.dsw
index 5496bedf54f..86639a8f6a3 100644
--- a/TAO/TAOACE.dsw
+++ b/TAO/TAOACE.dsw
@@ -935,6 +935,9 @@ Package=<4>
Begin Project Dependency
Project_Dep_Name DsLogAdmin
End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name RTEvent
+ End Project Dependency
}}}
###############################################################################
diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.dsw b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.dsw
index ffaad15c080..4ef0f9f8c59 100644
--- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.dsw
+++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
###############################################################################
-Project: "Logging_Service"=.\Basic_Logging_Service.dsp - Package Owner=<4>
+Project: "Logging_Service"=.\Logging_Service.dsp - Package Owner=<4>
Package=<5>
{{{
diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Logging_Service.dsp b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Logging_Service.dsp
index e7a3b5279f3..ced3e56f3f7 100644
--- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Logging_Service.dsp
+++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Logging_Service.dsp
@@ -8,12 +8,12 @@ CFG=Logging_Service - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
-!MESSAGE NMAKE /f "Basic_Logging_Service.mak".
+!MESSAGE NMAKE /f "Logging_Service.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Basic_Logging_Service.mak" CFG="Logging_Service - Win32 Debug"
+!MESSAGE NMAKE /f "Logging_Service.mak" CFG="Logging_Service - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -37,15 +37,15 @@ RSC=rc.exe
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release\Logging_Service"
-# PROP Intermediate_Dir "Release\Logging_Service"
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE CPP /nologo /W3 /GX /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../" /I "../../" /I "../" /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../../" /I "../../../" /I "../../" /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -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 ACE.lib TAO.lib TAO_PortableServer.lib TAO_DynamicAny.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_CosTrading.lib TAO_DsLogAdmin.lib /nologo /subsystem:console /machine:I386 /out:"Logging_Service.exe" /libpath:"../../orbsvcs" /libpath:"../../tao" /libpath:"../../../ace" /libpath:"../../tao/PortableServer"
+# ADD LINK32 TAO.lib TAO_PortableServer.lib TAO_DsLogAdmin.lib TAO_CosNaming.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "Logging_Service - Win32 Debug"
@@ -81,7 +81,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 TAOd.lib TAO_PortableServerd.lib TAO_DsLogAdmind.lib TAO_CosNamingd.lib aced.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 /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"
+# ADD LINK32 TAOd.lib TAO_PortableServerd.lib TAO_DsLogAdmind.lib TAO_CosNamingd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.dsp b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.dsp
index ad436c7e44d..d9bb0026417 100644
--- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.dsp
+++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.dsp
@@ -37,7 +37,7 @@ RSC=rc.exe
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
+# PROP Output_Dir ""
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
@@ -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 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_CosNaming.lib TAO_DsLogAdmin.lib TAO_PortableServerd.lib TAO_CosEvent.lib ace.lib tao.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 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 /libpath:"../../orbsvcs" /libpath:"../../tao" /libpath:"../../../ace" /libpath:"../../tao/PortableServer"
+# ADD LINK32 TAO.lib TAO_DsEventLogAdmin.lib ace.lib TAO_PortableServer.lib TAO_DsLogAdmin.lib TAO_CosNaming.lib TAO_CosEvent.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "Event_Logging_Service - Win32 Debug"
@@ -77,7 +77,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 TAOd.lib TAO_DsEventLogAdmind.lib aced.lib TAO_PortableServerd.lib TAO_DsLogAdmind.lib TAO_CosNamingd.lib TAO_CosEventd.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 /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"
+# ADD LINK32 TAOd.lib TAO_DsEventLogAdmind.lib aced.lib TAO_PortableServerd.lib TAO_DsLogAdmind.lib TAO_CosNamingd.lib TAO_CosEventd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.dsp b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.dsp
index 8634b015b0e..45681d15530 100644
--- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.dsp
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.dsp
@@ -37,13 +37,13 @@ RSC=rc.exe
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
+# PROP Output_Dir ""
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../../" /I "../../../" /I "../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x809 /d "NDEBUG"
BSC32=bscmake.exe
@@ -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 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_DynamicAny.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_CosTrading.lib TAO_DsLogAdmin.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 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 /libpath:"../../orbsvcs" /libpath:"../../tao" /libpath:"../../../ace" /libpath:"../../tao/PortableServer"
+# ADD LINK32 TAO_IORTable.lib TAO.lib TAO_CosNotification.lib TAO_DsNotifyLogAdmin.lib ace.lib TAO_PortableServer.lib TAO_DsLogAdmin.lib TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\IORTable" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "Notify_Logging_Service - Win32 Debug"
@@ -77,7 +77,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 TAO_IORTabled.lib TAOd.lib TAO_CosNotificationd.lib TAO_DsNotifyLogAdmind.lib aced.lib TAO_PortableServerd.lib TAO_DsLogAdmind.lib TAO_CosNamingd.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 /libpath:"..\..\..\tao\IORTable" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"
+# ADD LINK32 TAO_IORTabled.lib TAOd.lib TAO_CosNotificationd.lib TAO_DsNotifyLogAdmind.lib aced.lib TAO_PortableServerd.lib TAO_DsLogAdmind.lib TAO_CosNamingd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao\IORTable" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.dsp b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.dsp
index 4b075260be1..2568185d719 100644
--- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.dsp
+++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.dsp
@@ -37,13 +37,13 @@ RSC=rc.exe
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
+# PROP Output_Dir ""
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../../" /I "../../../" /I "../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /YX /FD /c
# ADD BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x809 /d "NDEBUG"
BSC32=bscmake.exe
@@ -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 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_DynamicAny.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_CosTrading.lib TAO_DsLogAdmin.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 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 /libpath:"../../orbsvcs" /libpath:"../../tao" /libpath:"../../../ace" /libpath:"../../tao/PortableServer"
+# ADD LINK32 TAO_CosNaming.lib TAO_RTEvent.lib TAO_RTOLDEvent.lib TAO_RTSched.lib TAO_PortableServer.lib TAO.lib ace.lib TAO_DsLogAdmin.lib TAO_RTEventLog.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "RTEvent_Logging_Service - Win32 Debug"
diff --git a/TAO/orbsvcs/examples/Log/Basic/Client.dsp b/TAO/orbsvcs/examples/Log/Basic/Client.dsp
index ab9de4084e5..45763cd4c23 100644
--- a/TAO/orbsvcs/examples/Log/Basic/Client.dsp
+++ b/TAO/orbsvcs/examples/Log/Basic/Client.dsp
@@ -37,11 +37,11 @@ RSC=rc.exe
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
+# PROP Output_Dir ""
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x809 /d "NDEBUG"
BSC32=bscmake.exe
@@ -49,7 +49,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 kernel32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 TAO.lib TAO_PortableServer.lib TAO_DsLogAdmin.lib TAO_CosNaming.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
!ELSEIF "$(CFG)" == "Client - Win32 Debug"
@@ -74,7 +74,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 TAOd.lib TAO_PortableServerd.lib TAO_DsLogAdmind.lib TAO_CosNamingd.lib aced.lib kernel32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 TAOd.lib TAO_PortableServerd.lib TAO_DsLogAdmind.lib TAO_CosNamingd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
!ENDIF
diff --git a/TAO/orbsvcs/examples/Log/Event/Log_CEC_Simple_Consumer.dsp b/TAO/orbsvcs/examples/Log/Event/Log_CEC_Simple_Consumer.dsp
index c8482361cec..5dcb9288168 100644
--- a/TAO/orbsvcs/examples/Log/Event/Log_CEC_Simple_Consumer.dsp
+++ b/TAO/orbsvcs/examples/Log/Event/Log_CEC_Simple_Consumer.dsp
@@ -37,11 +37,11 @@ RSC=rc.exe
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
+# PROP Output_Dir ""
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x809 /d "NDEBUG"
BSC32=bscmake.exe
@@ -49,7 +49,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 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 /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 TAO_CosEvent.lib TAO_DsEventLogAdmin.lib ace.lib tao.lib TAO_DsLogAdmin.lib TAO_PortableServer.lib TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
!ELSEIF "$(CFG)" == "Log_CEC_Simple_Consumer - Win32 Debug"
@@ -61,7 +61,7 @@ LINK32=link.exe
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir ""
-# PROP Intermediate_Dir "Debug\Log_CEC_Simple_Consumer"
+# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
@@ -74,7 +74,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 TAO_CosEventd.lib TAO_DsEventLogAdmind.lib aced.lib taod.lib TAO_DsLogAdmind.lib TAO_PortableServerd.lib TAO_CosNamingd.lib kernel32.lib /nologo /subsystem:console /debug /machine:I386 /out:"Consumer.exe" /pdbtype:sept /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 TAO_CosEventd.lib TAO_DsEventLogAdmind.lib aced.lib taod.lib TAO_DsLogAdmind.lib TAO_PortableServerd.lib TAO_CosNamingd.lib /nologo /subsystem:console /debug /machine:I386 /out:"Consumer.exe" /pdbtype:sept /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
!ENDIF
diff --git a/TAO/orbsvcs/examples/Log/Event/Log_CEC_Simple_Supplier.dsp b/TAO/orbsvcs/examples/Log/Event/Log_CEC_Simple_Supplier.dsp
index 40f2f2e3448..54ab77d584a 100644
--- a/TAO/orbsvcs/examples/Log/Event/Log_CEC_Simple_Supplier.dsp
+++ b/TAO/orbsvcs/examples/Log/Event/Log_CEC_Simple_Supplier.dsp
@@ -37,11 +37,11 @@ RSC=rc.exe
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
+# PROP Output_Dir ""
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x809 /d "NDEBUG"
BSC32=bscmake.exe
@@ -49,7 +49,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 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 /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 TAO_CosEvent.lib TAO_DsEventLogAdmin.lib ace.lib tao.lib TAO_DsLogAdmin.lib TAO_PortableServer.lib TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
!ELSEIF "$(CFG)" == "Log_CEC_Simple_Supplier - Win32 Debug"
@@ -61,7 +61,7 @@ LINK32=link.exe
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir ""
-# PROP Intermediate_Dir "Debug\Log_CEC_Simple_Supplier"
+# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
@@ -74,7 +74,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 TAO_CosEventd.lib TAO_DsEventLogAdmind.lib aced.lib taod.lib TAO_DsLogAdmind.lib TAO_PortableServerd.lib TAO_CosNamingd.lib kernel32.lib /nologo /subsystem:console /debug /machine:I386 /out:"Supplier.exe" /pdbtype:sept /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 TAO_CosEventd.lib TAO_DsEventLogAdmind.lib aced.lib taod.lib TAO_DsLogAdmind.lib TAO_PortableServerd.lib TAO_CosNamingd.lib /nologo /subsystem:console /debug /machine:I386 /out:"Supplier.exe" /pdbtype:sept /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
!ENDIF
diff --git a/TAO/orbsvcs/examples/Log/Notify/Log_Notify_Simple_Consumer.dsp b/TAO/orbsvcs/examples/Log/Notify/Log_Notify_Simple_Consumer.dsp
index aa19102b02e..f8b5f4844a5 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Log_Notify_Simple_Consumer.dsp
+++ b/TAO/orbsvcs/examples/Log/Notify/Log_Notify_Simple_Consumer.dsp
@@ -37,11 +37,11 @@ RSC=rc.exe
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
+# PROP Output_Dir ""
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x809 /d "NDEBUG"
BSC32=bscmake.exe
@@ -49,7 +49,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 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 /libpath:"..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 TAO_CosEvent.lib TAO_CosNotification.lib TAO_DsNotifyLogAdmin.lib TAO_DsEventLogAdmin.lib ace.lib tao.lib TAO_DsLogAdmin.lib TAO_PortableServer.lib TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
!ELSEIF "$(CFG)" == "Log_Notify_Simple_Consumer - Win32 Debug"
@@ -74,7 +74,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 TAO_CosEventd.lib TAO_CosNotificationd.lib TAO_DsNotifyLogAdmind.lib TAO_CosEventd.lib TAO_DsEventLogAdmind.lib aced.lib taod.lib TAO_DsLogAdmind.lib TAO_PortableServerd.lib TAO_CosNamingd.lib kernel32.lib /nologo /subsystem:console /debug /machine:I386 /out:"Consumer.exe" /pdbtype:sept /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 TAO_CosEventd.lib TAO_CosNotificationd.lib TAO_DsNotifyLogAdmind.lib TAO_DsEventLogAdmind.lib aced.lib taod.lib TAO_DsLogAdmind.lib TAO_PortableServerd.lib TAO_CosNamingd.lib /nologo /subsystem:console /debug /machine:I386 /out:"Consumer.exe" /pdbtype:sept /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
!ENDIF
diff --git a/TAO/orbsvcs/examples/Log/Notify/Log_Notify_Simple_Supplier.dsp b/TAO/orbsvcs/examples/Log/Notify/Log_Notify_Simple_Supplier.dsp
index f681c3c4e6e..4b1ae27fc0c 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Log_Notify_Simple_Supplier.dsp
+++ b/TAO/orbsvcs/examples/Log/Notify/Log_Notify_Simple_Supplier.dsp
@@ -37,11 +37,11 @@ RSC=rc.exe
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
+# PROP Output_Dir ""
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x809 /d "NDEBUG"
BSC32=bscmake.exe
@@ -49,7 +49,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 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 /libpath:"..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 TAO_CosEvent.lib TAO_CosNotification.lib TAO_DsNotifyLogAdmin.lib TAO_DsEventLogAdmin.lib ace.lib tao.lib TAO_DsLogAdmin.lib TAO_PortableServer.lib TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
!ELSEIF "$(CFG)" == "Log_Notify_Simple_Supplier - Win32 Debug"
@@ -74,7 +74,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 TAO_CosEventd.lib TAO_CosNotificationd.lib TAO_DsNotifyLogAdmind.lib TAO_CosEventd.lib TAO_DsEventLogAdmind.lib aced.lib taod.lib TAO_DsLogAdmind.lib TAO_PortableServerd.lib TAO_CosNamingd.lib kernel32.lib /nologo /subsystem:console /debug /machine:I386 /out:"Supplier.exe" /pdbtype:sept /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 TAO_CosEventd.lib TAO_CosNotificationd.lib TAO_DsNotifyLogAdmind.lib TAO_DsEventLogAdmind.lib aced.lib taod.lib TAO_DsLogAdmind.lib TAO_PortableServerd.lib TAO_CosNamingd.lib /nologo /subsystem:console /debug /machine:I386 /out:"Supplier.exe" /pdbtype:sept /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
!ENDIF
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/Log_RTEvent_Simple_Consumer.dsp b/TAO/orbsvcs/examples/Log/RTEvent/Log_RTEvent_Simple_Consumer.dsp
index dd1f5f16221..90cd9c5045b 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/Log_RTEvent_Simple_Consumer.dsp
+++ b/TAO/orbsvcs/examples/Log/RTEvent/Log_RTEvent_Simple_Consumer.dsp
@@ -37,11 +37,11 @@ RSC=rc.exe
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
+# PROP Output_Dir ""
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x809 /d "NDEBUG"
BSC32=bscmake.exe
@@ -49,7 +49,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 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 /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 TAO_RTEvent.lib TAO_RTEventLog.lib ace.lib tao.lib TAO_DsLogAdmin.lib TAO_PortableServer.lib TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
!ELSEIF "$(CFG)" == "Log_RTEvent_Simple_Consumer - Win32 Debug"
@@ -74,7 +74,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 TAO_RTEventd.lib TAO_RTEventLogd.lib aced.lib taod.lib TAO_DsLogAdmind.lib TAO_PortableServerd.lib TAO_CosNamingd.lib kernel32.lib /nologo /subsystem:console /debug /machine:I386 /out:"Consumer.exe" /pdbtype:sept /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 TAO_RTEventd.lib TAO_RTEventLogd.lib aced.lib taod.lib TAO_DsLogAdmind.lib TAO_PortableServerd.lib TAO_CosNamingd.lib /nologo /subsystem:console /debug /machine:I386 /out:"Consumer.exe" /pdbtype:sept /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
!ENDIF
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/Log_RTEvent_Simple_Supplier.dsp b/TAO/orbsvcs/examples/Log/RTEvent/Log_RTEvent_Simple_Supplier.dsp
index 6e7a10d4c74..48f9a0e3d34 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/Log_RTEvent_Simple_Supplier.dsp
+++ b/TAO/orbsvcs/examples/Log/RTEvent/Log_RTEvent_Simple_Supplier.dsp
@@ -37,11 +37,11 @@ RSC=rc.exe
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
+# PROP Output_Dir ""
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x809 /d "NDEBUG"
BSC32=bscmake.exe
@@ -49,7 +49,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 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 /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 TAO_RTEvent.lib TAO_RTEventLog.lib ace.lib tao.lib TAO_DsLogAdmin.lib TAO_PortableServer.lib TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
!ELSEIF "$(CFG)" == "Log_RTEvent_Simple_Supplier - Win32 Debug"
@@ -74,7 +74,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 TAO_RTEventd.lib TAO_RTEventLogd.lib aced.lib taod.lib TAO_DsLogAdmind.lib TAO_PortableServerd.lib TAO_CosNamingd.lib kernel32.lib /nologo /subsystem:console /debug /machine:I386 /out:"Supplier.exe" /pdbtype:sept /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 TAO_RTEventd.lib TAO_RTEventLogd.lib aced.lib taod.lib TAO_DsLogAdmind.lib TAO_PortableServerd.lib TAO_CosNamingd.lib /nologo /subsystem:console /debug /machine:I386 /out:"Supplier.exe" /pdbtype:sept /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
!ENDIF
diff --git a/TAO/orbsvcs/orbsvcs/RTEventLog.dsp b/TAO/orbsvcs/orbsvcs/RTEventLog.dsp
index 366c625ccdb..7e4e315002c 100644
--- a/TAO/orbsvcs/orbsvcs/RTEventLog.dsp
+++ b/TAO/orbsvcs/orbsvcs/RTEventLog.dsp
@@ -38,11 +38,12 @@ RSC=rc.exe
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
+# PROP Output_Dir ""
# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "RTEVENTLOG_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "RTEVENTLOG_EXPORTS" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_ORBSVCS_HAS_NAMING" /D "TAO_RTEVENTLOG_BUILD_DLL" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -53,16 +54,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 /dll /machine:I386
-# ADD 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 /dll /machine:I386
-# Begin Custom Build
-InputPath=.\Release\RTEventLog.dll
-InputName=RTEventLog
-SOURCE="$(InputPath)"
-
-"f" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- ..\..\..\bin\Release\tao_idl -Ge 1 -I../.. -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_NotifyLog_Export -Wb,export_include=Log\notifylog_export.h $(InputName).idl
-
-# End Custom Build
+# ADD LINK32 TAO.lib ace.lib TAO_PortableServer.lib TAO_DsLogAdmin.lib TAO_RTEvent.lib TAO_CosNaming.lib TAO_RTSched.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\Release/RTEventLog.dll" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
!ELSEIF "$(CFG)" == "RTEventLog - Win32 Debug"
diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.dsp b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.dsp
index 15a0946812a..11d5dd7e253 100644
--- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.dsp
+++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.dsp
@@ -37,11 +37,12 @@ RSC=rc.exe
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
+# PROP Output_Dir ""
# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "../../../" /I "../../../../tao" /I "../../../../" /I "../../../../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../" /I "../../../../" /I "../../../../tao" /I "../../../../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x809 /d "NDEBUG"
BSC32=bscmake.exe
@@ -49,7 +50,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 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 /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 ace.lib tao.lib TAO_Svc_Utils.lib TAO_DsLogAdmin.lib TAO_CosNaming.lib kernel32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\orbsvcs\ETCL" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
!ELSEIF "$(CFG)" == "Basic_Log_Test - Win32 Debug"
diff --git a/TAO/tests/IDL_Test/idl_test.dsp b/TAO/tests/IDL_Test/idl_test.dsp
index 91b86b63271..f41fb927ad2 100644
--- a/TAO/tests/IDL_Test/idl_test.dsp
+++ b/TAO/tests/IDL_Test/idl_test.dsp
@@ -893,6 +893,7 @@ SOURCE=.\full.idl
!IF "$(CFG)" == "idl_test - Win32 Release"
+# PROP Ignore_Default_Tool 1
USERDEP__FULL_="..\..\..\bin\release\tao_idl.exe"
# Begin Custom Build - Invoking TAO IDL Compiler on $(InputName).idl
InputPath=.\full.idl
@@ -905,6 +906,7 @@ InputName=full
!ELSEIF "$(CFG)" == "idl_test - Win32 Debug"
+# PROP Ignore_Default_Tool 1
USERDEP__FULL_="..\..\..\bin\tao_idl.exe"
# Begin Custom Build - Invoking TAO IDL Compiler on $(InputName).idl
InputPath=.\full.idl
@@ -924,6 +926,7 @@ SOURCE=.\fwd.idl
!IF "$(CFG)" == "idl_test - Win32 Release"
+# PROP Ignore_Default_Tool 1
USERDEP__FWD_I="..\..\..\bin\release\tao_idl.exe"
# Begin Custom Build - Invoking TAO IDL Compiler on $(InputName).idl
InputPath=.\fwd.idl
@@ -936,6 +939,7 @@ InputName=fwd
!ELSEIF "$(CFG)" == "idl_test - Win32 Debug"
+# PROP Ignore_Default_Tool 1
USERDEP__FWD_I="..\..\..\bin\tao_idl.exe"
# Begin Custom Build - Invoking TAO IDL Compiler on $(InputName).idl
InputPath=.\fwd.idl
@@ -1040,6 +1044,7 @@ SOURCE=.\gperf.idl
!IF "$(CFG)" == "idl_test - Win32 Release"
+# PROP Ignore_Default_Tool 1
# Begin Custom Build - Invoking TAO IDL Compiler on $(InputName).idl
InputPath=.\gperf.idl
InputName=gperf
@@ -1062,6 +1067,7 @@ BuildCmds= \
!ELSEIF "$(CFG)" == "idl_test - Win32 Debug"
+# PROP Ignore_Default_Tool 1
USERDEP__GPERF="..\..\..\bin\tao_idl.exe"
# Begin Custom Build - Invoking TAO IDL Compiler on $(InputName).idl
InputPath=.\gperf.idl
@@ -1486,6 +1492,7 @@ BuildCmds= \
!ELSEIF "$(CFG)" == "idl_test - Win32 Debug"
+# PROP Ignore_Default_Tool 1
USERDEP__NESTE="..\..\..\bin\tao_idl.exe"
# Begin Custom Build - Invoking TAO IDL Compiler on $(InputName).idl
InputPath=.\nested_scope.idl
@@ -1570,6 +1577,7 @@ BuildCmds= \
!ELSEIF "$(CFG)" == "idl_test - Win32 Debug"
+# PROP Ignore_Default_Tool 1
USERDEP__PARAM="..\..\..\bin\tao_idl.exe"
# Begin Custom Build - Invoking TAO IDL Compiler on $(InputName).idl
InputPath=.\params.idl
@@ -1654,6 +1662,7 @@ BuildCmds= \
!ELSEIF "$(CFG)" == "idl_test - Win32 Debug"
+# PROP Ignore_Default_Tool 1
USERDEP__PRAGM="..\..\..\bin\tao_idl.exe"
# Begin Custom Build - Invoking TAO IDL Compiler on $(InputName).idl
InputPath=.\pragma.idl
@@ -1699,6 +1708,7 @@ SOURCE=.\reopen_include1.idl
!IF "$(CFG)" == "idl_test - Win32 Release"
+# PROP Ignore_Default_Tool 1
USERDEP__REOPE="..\..\..\bin\release\tao_idl.exe"
# Begin Custom Build - Invoking TAO IDL Compiler on $(InputName).idl
InputPath=.\reopen_include1.idl
@@ -1711,6 +1721,7 @@ InputName=reopen_include1
!ELSEIF "$(CFG)" == "idl_test - Win32 Debug"
+# PROP Ignore_Default_Tool 1
USERDEP__REOPE="..\..\..\bin\tao_idl.exe"
# Begin Custom Build - Invoking TAO IDL Compiler on $(InputName).idl
InputPath=.\reopen_include1.idl
@@ -1730,6 +1741,7 @@ SOURCE=.\reopen_include2.idl
!IF "$(CFG)" == "idl_test - Win32 Release"
+# PROP Ignore_Default_Tool 1
USERDEP__REOPEN="..\..\..\bin\release\tao_idl.exe"
# Begin Custom Build - Invoking TAO IDL Compiler on $(InputName).idl
InputPath=.\reopen_include2.idl
@@ -1742,6 +1754,7 @@ InputName=reopen_include2
!ELSEIF "$(CFG)" == "idl_test - Win32 Debug"
+# PROP Ignore_Default_Tool 1
USERDEP__REOPEN="..\..\..\bin\tao_idl.exe"
# Begin Custom Build - Invoking TAO IDL Compiler on $(InputName).idl
InputPath=.\reopen_include2.idl
@@ -1846,8 +1859,19 @@ SOURCE=.\repo_id_mod.idl
!IF "$(CFG)" == "idl_test - Win32 Release"
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputName).idl
+InputPath=.\repo_id_mod.idl
+InputName=repo_id_mod
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ ..\..\..\bin\release\tao_idl -Ge 1 $(InputName).idl
+
+# End Custom Build
+
!ELSEIF "$(CFG)" == "idl_test - Win32 Debug"
+# PROP Ignore_Default_Tool 1
USERDEP__REPO_="..\..\..\bin\tao_idl.exe"
# Begin Custom Build - Invoking TAO IDL Compiler on $(InputName).idl
InputPath=.\repo_id_mod.idl