ChangeLogTag: Tue Dec 9 17:11:13 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>

7 files changed, 13 insertions, 13 deletions

diff --git a/TAO/docs/tutorials/Quoter/AMI/client.dsp b/TAO/docs/tutorials/Quoter/AMI/client.dsp
index 04e26e230e0..ac354dbb9e8 100644
--- a/TAO/docs/tutorials/Quoter/AMI/client.dsp
+++ b/TAO/docs/tutorials/Quoter/AMI/client.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # 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 /MD /W3 /GX /O2 /I "../../../../../" /I "../../../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../../../" /I "../../../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

diff --git a/TAO/examples/Logging/Logging_Service.dsp b/TAO/examples/Logging/Logging_Service.dsp
index 603cac14415..2440f040566 100644
--- a/TAO/examples/Logging/Logging_Service.dsp
+++ b/TAO/examples/Logging/Logging_Service.dsp
@@ -45,7 +45,7 @@ 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 "../../orbsvcs/" /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c

+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../" /I "../../" /I "../../orbsvcs/" /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

@@ -72,7 +72,7 @@ MTL=midl.exe
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../" /I "../../" /I "../../orbsvcs/" /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "_DEBUG" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../../../" /I "../../" /I "../../orbsvcs/" /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "_DEBUG" /FD /c

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

diff --git a/TAO/examples/Logging/Logging_Test.dsp b/TAO/examples/Logging/Logging_Test.dsp
index 75298cb7da0..b85dec0522e 100644
--- a/TAO/examples/Logging/Logging_Test.dsp
+++ b/TAO/examples/Logging/Logging_Test.dsp
@@ -45,7 +45,7 @@ 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 "../../orbsvcs/" /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c

+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../" /I "../../" /I "../../orbsvcs/" /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

@@ -72,7 +72,7 @@ MTL=midl.exe
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../" /I "../../" /I "../../orbsvcs/" /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "_DEBUG" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../../../" /I "../../" /I "../../orbsvcs/" /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "_DEBUG" /FD /c

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

diff --git a/TAO/examples/Simple/bank/client.dsp b/TAO/examples/Simple/bank/client.dsp
index 5a7336791b9..e59f51995fa 100644
--- a/TAO/examples/Simple/bank/client.dsp
+++ b/TAO/examples/Simple/bank/client.dsp
@@ -92,7 +92,7 @@ LINK32=link.exe
 # Begin Source File

 

 SOURCE=.\Bank_Client_i.cpp

-# ADD CPP /GR-

+# ADD CPP /GR

 # End Source File

 # Begin Source File

 

@@ -102,12 +102,12 @@ SOURCE=.\BankC.cpp
 # Begin Source File

 

 SOURCE=.\BankS.cpp

-# ADD CPP /GR-

+# ADD CPP /GR

 # End Source File

 # Begin Source File

 

 SOURCE=.\client.cpp

-# ADD CPP /GR-

+# ADD CPP /GR

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.dsp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.dsp
index cd9081a7202..c3f39772621 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.dsp
+++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # 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 /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "..\..\.." /I "..\..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -67,7 +67,7 @@ LINK32=link.exe
 # 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

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "..\..\.." /I "..\..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryServer.dsp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryServer.dsp
index 09e686f1e77..b4fc1df8dd2 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryServer.dsp
+++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryServer.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # 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 /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "..\..\.." /I "..\..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -67,7 +67,7 @@ LINK32=link.exe
 # 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

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "..\..\.." /I "..\..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

diff --git a/TAO/orbsvcs/tests/Concurrency/CC_client.dsp b/TAO/orbsvcs/tests/Concurrency/CC_client.dsp
index 1deace69eab..5098b8d6ad9 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_client.dsp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_client.dsp
@@ -44,7 +44,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 /machine:IX86

-# ADD LINK32 advapi32.lib user32.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_IORTable.lib TAO_CosConcurrency.lib TAO_PortableServer.lib TAO_IORInterceptor.lib TAO_Valuetype.lib TAO_ObjRefTemplate.lib TAO.lib ACE.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\lib" /libpath:"..\..\..\tao\IORTable" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\Valuetype" /libpath:"..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao\ObjrefTemplate" /version:1.3.4

+# ADD LINK32 advapi32.lib user32.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_IORTable.lib TAO_CosConcurrency.lib TAO_PortableServer.lib TAO_IORInterceptor.lib TAO_Valuetype.lib TAO_ObjRefTemplate.lib TAO.lib ACE.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\lib" /libpath:"..\..\..\tao\IORTable" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\Valuetype" /libpath:"..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao\ObjrefTemplate ..\..\..\tao\orbsvcs\orbsvcs" /version:1.3.4

 # SUBTRACT LINK32 /pdb:none

 

 !ELSEIF  "$(CFG)" == "CC_client - Win32 Debug"