ChangeLogTag: Wed Dec 10 09:03:01 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>

5 files changed, 15 insertions, 20 deletions

diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.dsp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.dsp
index 14e5d3835f8..e03d0de4658 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.dsp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.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 ../../../../../ace/ACE.lib ../../../../tao/TAO.lib ../../../../tao/PortableServer/TAO_PortableServer.lib ../../../../tao/IORManipulation/TAO_IORManip.lib ../../../orbsvcs/TAO_FT_ClientORB.lib  ../../../orbsvcs/TAO_FT_ServerORB.lib /nologo /subsystem:console /machine:I386 /out:"Manager.exe"

+# ADD LINK32 ../../../../../ace/ACE.lib ../../../../tao/TAO.lib ../../../../tao/PortableServer/TAO_PortableServer.lib ../../../../tao/IORManipulation/TAO_IORManip.lib ../../../orbsvcs/TAO_FT_ClientORB.lib ../../../orbsvcs/TAO_FT_ServerORB.lib  ../../../orbsvcs/TAO_FTORB_Utils.lib /nologo /subsystem:console /machine:I386 /out:"Manager.exe"

 

 !ELSEIF  "$(CFG)" == "FaultTolerance IOGR Manager - Win32 Debug"

 

diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.dsp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.dsp
index 5c6fe5475ac..7272c17b93f 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.dsp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/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/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.dsp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.dsp
index f7105df2134..0a031c9cfff 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.dsp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.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 "../../../../../orbsvcs" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../../../.." /I "../../../../.." /I "../../../../../orbsvcs" /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/tests/Bug_1330_Regression/Bug_1330_Client.dsp b/TAO/tests/Bug_1330_Regression/Bug_1330_Client.dsp
index cd7bb8a7905..9128af95814 100644
--- a/TAO/tests/Bug_1330_Regression/Bug_1330_Client.dsp
+++ b/TAO/tests/Bug_1330_Regression/Bug_1330_Client.dsp
@@ -113,7 +113,6 @@ SOURCE=.\Test.idl
 

 !IF  "$(CFG)" == "Bug 1330 Client EXE - Win32 Release"

 

-# PROP Ignore_Default_Tool 1

 # Begin Custom Build - Invoking TAO_IDL Compiler on $(InputPath)

 OutDir=.\Release

 InputPath=.\Test.idl

@@ -122,22 +121,22 @@ InputName=Test
 BuildCmds= \

 	..\..\..\bin\release\tao_idl -o $(OutDir) -Ge 1 -Sc $(InputPath)

 

-"$(OutDir)\$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+".\$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"$(OutDir)\$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+".\$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"$(OutDir)\$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+".\$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"$(OutDir)\$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+".\$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"$(OutDir)\$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+".\$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"$(OutDir)\$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+".\$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 # End Custom Build

 

diff --git a/TAO/tests/Bug_1330_Regression/Bug_1330_Server.dsp b/TAO/tests/Bug_1330_Regression/Bug_1330_Server.dsp
index fe22f263bb9..8f70100dc3d 100644
--- a/TAO/tests/Bug_1330_Regression/Bug_1330_Server.dsp
+++ b/TAO/tests/Bug_1330_Regression/Bug_1330_Server.dsp
@@ -135,29 +135,25 @@ SOURCE=.\Test.idl
 

 # PROP Ignore_Default_Tool 1

 # Begin Custom Build - Invoking TAO_IDL Compiler on $(InputPath)

-OutDir=.\Release

 InputPath=.\Test.idl

 InputName=Test

 

 BuildCmds= \

-	..\..\..\bin\release\tao_idl -o $(OutDir) -Ge 1 -Sc $(InputPath)

+	..\..\..\bin\release\tao_idl -Ge 1 -Sc $(InputPath)

 

-"$(OutDir)\$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(OutDir)\$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+".\$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"$(OutDir)\$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+".\$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"$(OutDir)\$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+".\$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"$(OutDir)\$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+".\$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"$(OutDir)\$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+".\$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 # End Custom Build