diff options
| author | Angelo Corsaro <angelo@icorsaro.net> | 2000-10-10 18:21:49 +0000 |
|---|---|---|
| committer | Angelo Corsaro <angelo@icorsaro.net> | 2000-10-10 18:21:49 +0000 |
| commit | 572f6ba54617ffd206b8661b6ecdac6911c31296 (patch) | |
| tree | 584d0d60225e5ce1fae3d5b2968ba2bcda7f5914 | |
| parent | 67b2b1110bf98f4bb3f9a9eb4e76086406feaa91 (diff) | |
| download | ATCD-572f6ba54617ffd206b8661b6ecdac6911c31296.tar.gz | |
ChangeLogTag: Tue Oct 10 13:11:09 2000 Angelo Corsaro <corsaro@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 12 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Fault_Tolerance.dsp | 2 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/Makefile.bor | 2 | ||||
| -rw-r--r-- | TAO/tests/Object_Loader/driver.dsp | 5 |
4 files changed, 17 insertions, 4 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 30347c151fa..83eb0dc02e5 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,15 @@ +Tue Oct 10 13:11:09 2000 Angelo Corsaro <corsaro@cs.wustl.edu> + + * orbsvcs/orbsvcs/Fault_Tolerance.dsp: + * tests/Object_Loader/driver.dsp: + + Made some other project setting to fix lining errors. + + * tao/PortableServer/Makefile.bor: + + Fixed typo i.e. renamed RT_PortableServerC.obj + to RTPortableServerC.obj. + Tue Oct 10 07:20:27 2000 Balachandran Natarajan <bala@cs.wustl.edu> * orbsvcs/orbsvcs/Makefile : Fixed a pre GNU 2.8 problem for FT diff --git a/TAO/orbsvcs/orbsvcs/Fault_Tolerance.dsp b/TAO/orbsvcs/orbsvcs/Fault_Tolerance.dsp index de491dd044a..8a5762ebb33 100644 --- a/TAO/orbsvcs/orbsvcs/Fault_Tolerance.dsp +++ b/TAO/orbsvcs/orbsvcs/Fault_Tolerance.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 /dll /machine:I386
-# ADD LINK32 ace.lib TAO.lib TAO_IORManip.lib TAO_PortableServer.lib TAO_CosNaming.lib TAO_CosNotification.lib TAO_Svc_Utils.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_Fault_Tolerance.dll" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\tao\IORManipulation" /libpath:"..\..\..\ace"
+# ADD LINK32 ace.lib TAO.lib TAO_IORManip.lib TAO_PortableServer.lib TAO_CosNaming.lib TAO_CosNotification.lib TAO_Svc_Utils.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_Fault_Tolerance.dll" /libpath:"..\..\tao\Po..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\tao\IORManipulation" /libpath:"..\..\..\ace"
!ELSEIF "$(CFG)" == "Fault Tolerance - Win32 Debug"
diff --git a/TAO/tao/PortableServer/Makefile.bor b/TAO/tao/PortableServer/Makefile.bor index 8a99e13d312..acae3e96f50 100644 --- a/TAO/tao/PortableServer/Makefile.bor +++ b/TAO/tao/PortableServer/Makefile.bor @@ -24,7 +24,7 @@ OBJFILES = \ $(OBJDIR)\PortableServer.obj \ $(OBJDIR)\PortableServerC.obj \ $(OBJDIR)\Servant_Base.obj \ - $(OBJDIR)\RT_PortableServerC.obj \ + $(OBJDIR)\RTPortableServerC.obj \ $(OBJDIR)\Strategized_Object_Proxy_Broker.obj \ $(OBJDIR)\ThruPOA_Object_Proxy_Impl.obj diff --git a/TAO/tests/Object_Loader/driver.dsp b/TAO/tests/Object_Loader/driver.dsp index e04c4503302..087825d914d 100644 --- a/TAO/tests/Object_Loader/driver.dsp +++ b/TAO/tests/Object_Loader/driver.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 tao.lib ace.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao"
+# ADD LINK32 tao.lib ace.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer"
!ELSEIF "$(CFG)" == "Object_Loader Driver - Win32 Debug"
@@ -64,6 +64,7 @@ LINK32=link.exe # PROP Use_Debug_Libraries 1
# PROP Output_Dir ""
# 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
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\.." /D OLT_HAS_DLL=0 /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
@@ -75,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 taod.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao"
+# ADD LINK32 taod.lib aced.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer"
!ENDIF
|