diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/all.dsw | 36 | ||||
| -rw-r--r-- | cpp/src/Ice/ice.dsp | 14 | ||||
| -rw-r--r-- | cpp/test/Ice/objects/objectsCOL.dsp | 6 | ||||
| -rw-r--r-- | cpp/test/Ice/operations/operationsC.dsp | 10 | ||||
| -rw-r--r-- | cpp/test/Ice/operations/operationsCOL.dsp | 10 |
5 files changed, 28 insertions, 48 deletions
diff --git a/cpp/all.dsw b/cpp/all.dsw index b80f779ec4a..d74fe8732b4 100644 --- a/cpp/all.dsw +++ b/cpp/all.dsw @@ -1749,42 +1749,6 @@ Package=<4> ###############################################################################
-Project: "locationForwardC"=.\test\Ice\locationForward\locationForwardC.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name Ice
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name IceUtil
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "locationForwardS"=.\test\Ice\locationForward\locationForwardS.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name Ice
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name IceUtil
- End Project Dependency
-}}}
-
-###############################################################################
-
Project: "locationS"=.\test\Ice\location\locationS.dsp - Package Owner=<4>
Package=<5>
diff --git a/cpp/src/Ice/ice.dsp b/cpp/src/Ice/ice.dsp index f96cd66b42e..a75204aff81 100644 --- a/cpp/src/Ice/ice.dsp +++ b/cpp/src/Ice/ice.dsp @@ -57,6 +57,7 @@ LINK32=link.exe # ADD LINK32 ws2_32.lib libbz2.lib /nologo /dll /machine:I386 /out:"Release/ice001.dll"
# SUBTRACT LINK32 /pdb:none /debug /nodefaultlib
# Begin Special Build Tool
+OutDir=.\Release
SOURCE="$(InputPath)"
PostBuild_Cmds=copy $(OutDir)\ice001.lib ..\..\lib copy $(OutDir)\ice001.pdb ..\..\lib copy $(OutDir)\ice001.dll ..\..\bin
# End Special Build Tool
@@ -89,6 +90,7 @@ LINK32=link.exe # ADD LINK32 ws2_32.lib libbz2d.lib /nologo /dll /debug /machine:I386 /out:"Debug/ice001d.dll" /pdbtype:sept
# SUBTRACT LINK32 /pdb:none /nodefaultlib
# Begin Special Build Tool
+OutDir=.\Debug
SOURCE="$(InputPath)"
PostBuild_Cmds=copy $(OutDir)\ice001d.lib ..\..\lib copy $(OutDir)\ice001d.pdb ..\..\lib copy $(OutDir)\ice001d.dll ..\..\bin
# End Special Build Tool
@@ -260,6 +262,10 @@ SOURCE=.\Outgoing.cpp # End Source File
# Begin Source File
+SOURCE=.\OutgoingAsync.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\Plugin.cpp
# End Source File
# Begin Source File
@@ -632,6 +638,14 @@ SOURCE=..\..\include\Ice\Outgoing.h # End Source File
# Begin Source File
+SOURCE=..\..\include\Ice\OutgoingAsync.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\Ice\OutgoingAsyncF.h
+# End Source File
+# Begin Source File
+
SOURCE=.\PicklerI.h
# End Source File
# Begin Source File
diff --git a/cpp/test/Ice/objects/objectsCOL.dsp b/cpp/test/Ice/objects/objectsCOL.dsp index b97e1a45e00..25742f39598 100644 --- a/cpp/test/Ice/objects/objectsCOL.dsp +++ b/cpp/test/Ice/objects/objectsCOL.dsp @@ -132,8 +132,7 @@ USERDEP__TEST_="../../../bin/slice2cpp.exe" InputPath=.\Test.ice
BuildCmds= \
- ..\..\..\bin\slice2cpp.exe Test.ice \
-
+ ..\..\..\bin\slice2cpp.exe Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -149,8 +148,7 @@ USERDEP__TEST_="../../../bin/slice2cpp.exe" InputPath=.\Test.ice
BuildCmds= \
- ..\..\..\bin\slice2cpp.exe Test.ice \
-
+ ..\..\..\bin\slice2cpp.exe Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/cpp/test/Ice/operations/operationsC.dsp b/cpp/test/Ice/operations/operationsC.dsp index af21637899b..8ad6ce298a6 100644 --- a/cpp/test/Ice/operations/operationsC.dsp +++ b/cpp/test/Ice/operations/operationsC.dsp @@ -105,6 +105,10 @@ SOURCE=.\Test.cpp SOURCE=.\Twoways.cpp
# End Source File
+# Begin Source File
+
+SOURCE=.\TwowaysAMI.cpp
+# End Source File
# End Group
# Begin Group "Header Files"
@@ -128,8 +132,7 @@ USERDEP__TEST_="../../../bin/slice2cpp.exe" InputPath=.\Test.ice
BuildCmds= \
- ..\..\..\bin\slice2cpp.exe Test.ice \
-
+ ..\..\..\bin\slice2cpp.exe Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -145,8 +148,7 @@ USERDEP__TEST_="../../../bin/slice2cpp.exe" InputPath=.\Test.ice
BuildCmds= \
- ..\..\..\bin\slice2cpp.exe Test.ice \
-
+ ..\..\..\bin\slice2cpp.exe Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/cpp/test/Ice/operations/operationsCOL.dsp b/cpp/test/Ice/operations/operationsCOL.dsp index 9a50c85b2f4..98546968f7a 100644 --- a/cpp/test/Ice/operations/operationsCOL.dsp +++ b/cpp/test/Ice/operations/operationsCOL.dsp @@ -109,6 +109,10 @@ SOURCE=.\TestI.cpp SOURCE=.\Twoways.cpp
# End Source File
+# Begin Source File
+
+SOURCE=.\TwowaysAMI.cpp
+# End Source File
# End Group
# Begin Group "Header Files"
@@ -136,8 +140,7 @@ USERDEP__TEST_="../../../bin/slice2cpp.exe" InputPath=.\Test.ice
BuildCmds= \
- ..\..\..\bin\slice2cpp.exe Test.ice \
-
+ ..\..\..\bin\slice2cpp.exe Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -153,8 +156,7 @@ USERDEP__TEST_="../../../bin/slice2cpp.exe" InputPath=.\Test.ice
BuildCmds= \
- ..\..\..\bin\slice2cpp.exe Test.ice \
-
+ ..\..\..\bin\slice2cpp.exe Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
|