diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/ice.dsp | 166 | ||||
| -rw-r--r-- | cpp/src/IceStorm/dummy2.ice | 0 | ||||
| -rw-r--r-- | cpp/src/IceStorm/icestormS.dsp | 55 |
3 files changed, 99 insertions, 122 deletions
diff --git a/cpp/src/Ice/ice.dsp b/cpp/src/Ice/ice.dsp index f58d23bc22d..33c95bf2eb1 100644 --- a/cpp/src/Ice/ice.dsp +++ b/cpp/src/Ice/ice.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBRARY_EXPORTS" /Yu"stdafx.h" /FD /c
# ADD CPP /nologo /MD /W3 /WX /GR /GX /O2 /I ".." /I "../../include" /D "WIN32" /D "_UNICODE" /D "NDEBUG" /D "_CONSOLE" /D "_USRDLL" /D "ICE_API_EXPORTS" /YX /FD /c
-# SUBTRACT CPP /Z<none> /Fr
+# SUBTRACT CPP /Fr
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -128,6 +128,10 @@ SOURCE=.\CommunicatorI.cpp # End Source File
# Begin Source File
+SOURCE=.\Connection.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\Connector.cpp
# End Source File
# Begin Source File
@@ -856,6 +860,86 @@ InputPath=..\..\slice\Ice\CommunicatorF.ice # End Source File
# Begin Source File
+SOURCE=..\..\slice\Ice\Connection.ice
+
+!IF "$(CFG)" == "Ice - Win32 Release"
+
+USERDEP__CONNE="../../bin/slice2cpp.exe"
+# Begin Custom Build
+InputPath=..\..\slice\Ice\Connection.ice
+
+BuildCmds= \
+ set PATH=%PATH%;..\..\lib \
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/Connection.ice \
+ move Connection.h ..\..\include\Ice \
+
+
+"..\..\include\Ice\Connection.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"Connection.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "Ice - Win32 Debug"
+
+USERDEP__CONNE="../../bin/slice2cpp.exe"
+# Begin Custom Build
+InputPath=..\..\slice\Ice\Connection.ice
+
+BuildCmds= \
+ set PATH=%PATH%;..\..\lib \
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/Connection.ice \
+ move Connection.h ..\..\include\Ice \
+
+
+"..\..\include\Ice\Connection.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"Connection.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\slice\Ice\ConnectionF.ice
+
+!IF "$(CFG)" == "Ice - Win32 Release"
+
+USERDEP__CONNEC="../../bin/slice2cpp.exe"
+# Begin Custom Build
+InputPath=..\..\slice\Ice\ConnectionF.ice
+
+"..\..\include\Ice\ConnectionF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ set PATH=%PATH%;..\..\lib
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/ConnectionF.ice
+ move ConnectionF.h ..\..\include\Ice
+ del ConnectionF.cpp
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "Ice - Win32 Debug"
+
+USERDEP__CONNEC="../../bin/slice2cpp.exe"
+# Begin Custom Build
+InputPath=..\..\slice\Ice\ConnectionF.ice
+
+"..\..\include\Ice\ConnectionF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ set PATH=%PATH%;..\..\lib
+ ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/ConnectionF.ice
+ move ConnectionF.h ..\..\include\Ice
+ del ConnectionF.cpp
+
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
SOURCE=..\..\slice\Ice\Current.ice
!IF "$(CFG)" == "Ice - Win32 Release"
@@ -1311,86 +1395,6 @@ InputPath=..\..\slice\Ice\PropertiesF.ice # End Source File
# Begin Source File
-SOURCE=..\..\slice\Ice\Connection.ice
-
-!IF "$(CFG)" == "Ice - Win32 Release"
-
-USERDEP__PROPE="../../bin/slice2cpp.exe"
-# Begin Custom Build
-InputPath=..\..\slice\Ice\Connection.ice
-
-BuildCmds= \
- set PATH=%PATH%;..\..\lib \
- ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/Connection.ice \
- move Connection.h ..\..\include\Ice \
-
-
-"..\..\include\Ice\Connection.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"Connection.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "Ice - Win32 Debug"
-
-USERDEP__PROPE="../../bin/slice2cpp.exe"
-# Begin Custom Build
-InputPath=..\..\slice\Ice\Connection.ice
-
-BuildCmds= \
- set PATH=%PATH%;..\..\lib \
- ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/Connection.ice \
- move Connection.h ..\..\include\Ice \
-
-
-"..\..\include\Ice\Connection.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"Connection.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-# End Custom Build
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\slice\Ice\ConnectionF.ice
-
-!IF "$(CFG)" == "Ice - Win32 Release"
-
-USERDEP__PROPER="../../bin/slice2cpp.exe"
-# Begin Custom Build
-InputPath=..\..\slice\Ice\ConnectionF.ice
-
-"..\..\include\Ice\ConnectionF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- set PATH=%PATH%;..\..\lib
- ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/ConnectionF.ice
- move ConnectionF.h ..\..\include\Ice
- del ConnectionF.cpp
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "Ice - Win32 Debug"
-
-USERDEP__PROPER="../../bin/slice2cpp.exe"
-# Begin Custom Build
-InputPath=..\..\slice\Ice\ConnectionF.ice
-
-"..\..\include\Ice\ConnectionF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- set PATH=%PATH%;..\..\lib
- ..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/ConnectionF.ice
- move ConnectionF.h ..\..\include\Ice
- del ConnectionF.cpp
-
-# End Custom Build
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
SOURCE=..\..\slice\Ice\SecurityException.ice
!IF "$(CFG)" == "Ice - Win32 Release"
diff --git a/cpp/src/IceStorm/dummy2.ice b/cpp/src/IceStorm/dummy2.ice new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/cpp/src/IceStorm/dummy2.ice diff --git a/cpp/src/IceStorm/icestormS.dsp b/cpp/src/IceStorm/icestormS.dsp index 137d032fdb8..8d21bb52841 100644 --- a/cpp/src/IceStorm/icestormS.dsp +++ b/cpp/src/IceStorm/icestormS.dsp @@ -254,47 +254,6 @@ BuildCmds= \ # End Source File
# Begin Source File
-SOURCE=.\dummy2.ice
-
-!IF "$(CFG)" == "IceStormS - Win32 Release"
-
-# Begin Custom Build
-InputPath=.\dummy2.ice
-
-BuildCmds= \
- set PATH=%PATH%;..\..\lib \
- ..\..\bin\slice2freeze.exe --include-dir IceStorm -I.. -I..\..\slice --dict IceStorm::IdentityLinkDict,Ice::Identity,IceStorm::LinkInfo IdentityLinkDict LinkInfo.ice \
-
-
-"IdentityLinkDict.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"IdentityLinkDict.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "IceStormS - Win32 Debug"
-
-# Begin Custom Build
-InputPath=.\dummy2.ice
-
-BuildCmds= \
- set PATH=%PATH%;..\..\lib \
- ..\..\bin\slice2freeze.exe --include-dir IceStorm -I.. -I..\..\slice --dict IceStorm::IdentityLinkDict,Ice::Identity,IceStorm::LinkInfo IdentityLinkDict LinkInfo.ice \
-
-
-"IdentityLinkDict.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"IdentityLinkDict.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-# End Custom Build
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
SOURCE=.\IceStormInternal.ice
!IF "$(CFG)" == "IceStormS - Win32 Release"
@@ -346,6 +305,7 @@ InputPath=.\LinkInfo.ice BuildCmds= \
set PATH=%PATH%;..\..\lib \
..\..\bin\slice2cpp.exe --include-dir IceStorm -I../../slice -I.. LinkInfo.ice \
+ ..\..\bin\slice2freeze.exe --include-dir IceStorm -I../../slice -I.. --dict IceStorm::IdentityLinkDict,Ice::Identity,IceStorm::LinkInfo IdentityLinkDict ../IceStorm/LinkInfo.ice ../../slice/Ice/Identity.ice \
"LinkInfo.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -353,6 +313,12 @@ BuildCmds= \ "LinkInfo.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
+
+"IdentityLinkDict.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"IdentityLinkDict.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
# End Custom Build
!ELSEIF "$(CFG)" == "IceStormS - Win32 Debug"
@@ -363,6 +329,7 @@ InputPath=.\LinkInfo.ice BuildCmds= \
set PATH=%PATH%;..\..\lib \
..\..\bin\slice2cpp.exe --include-dir IceStorm -I../../slice -I.. LinkInfo.ice \
+ ..\..\bin\slice2freeze.exe --include-dir IceStorm -I../../slice -I.. --dict IceStorm::IdentityLinkDict,Ice::Identity,IceStorm::LinkInfo IdentityLinkDict ../IceStorm/LinkInfo.ice ../../slice/Ice/Identity.ice \
"LinkInfo.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -370,6 +337,12 @@ BuildCmds= \ "LinkInfo.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
+
+"IdentityLinkDict.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"IdentityLinkDict.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
# End Custom Build
!ENDIF
|