diff options
| author | Marc Laukien <marc@zeroc.com> | 2001-12-18 19:42:32 +0000 |
|---|---|---|
| committer | Marc Laukien <marc@zeroc.com> | 2001-12-18 19:42:32 +0000 |
| commit | 6154e20e5bcc91a165181e283159d82ef3db5d26 (patch) | |
| tree | fbc05fd092486fa68f4a335fee836f9ef2e2ea8a /cpp | |
| parent | added missing files (diff) | |
| download | ice-6154e20e5bcc91a165181e283159d82ef3db5d26.tar.bz2 ice-6154e20e5bcc91a165181e283159d82ef3db5d26.tar.xz ice-6154e20e5bcc91a165181e283159d82ef3db5d26.zip | |
fixes
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/Ice/ice.dsp | 18 | ||||
| -rw-r--r-- | cpp/test/IceStorm/federation/federationS.dsp | 7 |
2 files changed, 7 insertions, 18 deletions
diff --git a/cpp/src/Ice/ice.dsp b/cpp/src/Ice/ice.dsp index 09c7c964cbd..e27237d17be 100644 --- a/cpp/src/Ice/ice.dsp +++ b/cpp/src/Ice/ice.dsp @@ -116,7 +116,7 @@ SOURCE=.\BasicStream.cpp # End Source File
# Begin Source File
-SOURCE=.\Collector.cpp
+SOURCE=.\ConnectionFactory.cpp
# End Source File
# Begin Source File
@@ -144,10 +144,6 @@ SOURCE=.\Direct.cpp # End Source File
# Begin Source File
-SOURCE=.\Emitter.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\Endpoint.cpp
# End Source File
# Begin Source File
@@ -396,11 +392,11 @@ SOURCE=..\..\include\Ice\Buffer.h # End Source File
# Begin Source File
-SOURCE=.\Ice\Collector.h
+SOURCE=.\Ice\ConnectionFactory.h
# End Source File
# Begin Source File
-SOURCE=..\..\include\Ice\CollectorF.h
+SOURCE=..\..\include\Ice\ConnectionFactoryF.h
# End Source File
# Begin Source File
@@ -444,14 +440,6 @@ SOURCE=..\..\include\Ice\Direct.h # End Source File
# Begin Source File
-SOURCE=.\Ice\Emitter.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\Ice\EmitterF.h
-# End Source File
-# Begin Source File
-
SOURCE=.\Ice\Endpoint.h
# End Source File
# Begin Source File
diff --git a/cpp/test/IceStorm/federation/federationS.dsp b/cpp/test/IceStorm/federation/federationS.dsp index 9ca2f51a3d0..98d126b686b 100644 --- a/cpp/test/IceStorm/federation/federationS.dsp +++ b/cpp/test/IceStorm/federation/federationS.dsp @@ -25,7 +25,7 @@ CFG=federationS - Win32 Debug # PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
RSC=rc.exe
!IF "$(CFG)" == "federationS - Win32 Release"
@@ -49,9 +49,10 @@ RSC=rc.exe BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.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 ws2_32.lib jtc.lib /nologo /subsystem:console /machine:I386 /out:"publisher.exe" /libpath:"../../../lib"
+# SUBTRACT LINK32 /debug
!ELSEIF "$(CFG)" == "federationS - Win32 Debug"
@@ -74,7 +75,7 @@ LINK32=link.exe BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.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 ws2_32.lib jtcd.lib /nologo /subsystem:console /debug /machine:I386 /out:"subscriber.exe" /pdbtype:sept /libpath:"../../../lib"
|