diff options
| author | marina <marina@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-12-08 02:02:51 +0000 |
|---|---|---|
| committer | marina <marina@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-12-08 02:02:51 +0000 |
| commit | 20402df0418afc42aa4052de7acccb6ecfdb80e9 (patch) | |
| tree | b0dbc420c87dd455f01ea9ea3d94cfe88398bd9a | |
| parent | 36e152729502b3e614ae9b2379cba00bc6403a94 (diff) | |
| download | ATCD-20402df0418afc42aa4052de7acccb6ecfdb80e9.tar.gz | |
ChangeLogTag:Thu Dec 07 20:00:59 2000 Marina Spivak <marina@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 8 | ||||
| -rw-r--r-- | TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.dsp | 4 | ||||
| -rw-r--r-- | TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.dsp | 4 |
3 files changed, 11 insertions, 5 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 731e3530ba0..5d2e168cbba 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,10 @@ +Thu Dec 07 20:00:59 2000 Marina Spivak <marina@cs.wustl.edu> + + * tests/RTCORBA/MT_Client_Protocol_Priority/client.dsp + * tests/RTCORBA/MT_Client_Protocol_Priority/server.dsp: + + Fixed include directory for Strategies library. + Thu Dec 7 18:32:27 2000 Balachandran Natarajan <bala@cs.wustl.edu> * tao/DynamicInterface/DII_Reply_Dispatcher.cpp: Removed the @@ -295,7 +302,6 @@ Thu Dec 7 13:45:29 2000 Jeff Parsons <parsons@cs.wustl.edu> Regenerated the stub files updated the diff files. ->>>>>>> 1.2150 Thu Dec 7 03:01:02 2000 Darrell Brunsch <brunsch@uci.edu> * TAO_IDL/TAO_IDL_BE_LIB.dsp: diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.dsp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.dsp index 07325f283f4..fec2946e9a1 100644 --- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.dsp +++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.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 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 ace.lib TAO.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\Strategies..\..\..\tao" /libpath:"..\..\..\..\ace"
+# ADD LINK32 TAO_Strategies.lib ace.lib TAO.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\Strategies" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
!ELSEIF "$(CFG)" == "MT_Client_Protocol_Priority Client - Win32 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 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_Strategiesd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao\Strategies..\..\..\tao" /libpath:"..\..\..\..\ace"
+# ADD LINK32 TAO_Strategiesd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao\Strategies" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
!ENDIF
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.dsp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.dsp index 6c1e630d03e..b9cec70c58a 100644 --- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.dsp +++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.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 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_PortableServer.lib TAO_Strategies.lib ace.lib TAO.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\Strategies..\..\..\tao" /libpath:"..\..\..\..\ace"
+# ADD LINK32 TAO_PortableServer.lib TAO_Strategies.lib ace.lib TAO.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\Strategies" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
!ELSEIF "$(CFG)" == "MT_Client_Protocol_Priority Server - Win32 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 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_PortableServerd.lib TAO_Strategiesd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\Strategies..\..\..\tao" /libpath:"..\..\..\..\ace"
+# ADD LINK32 TAO_PortableServerd.lib TAO_Strategiesd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\Strategies" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
!ENDIF
|