Fixed some dependency problems.

6 files changed, 105 insertions, 0 deletions

diff --git a/cpp/src/Ice/ice.dsp b/cpp/src/Ice/ice.dsp
index 487429b1047..b8baae0da21 100644
--- a/cpp/src/Ice/ice.dsp
+++ b/cpp/src/Ice/ice.dsp
@@ -1135,6 +1135,23 @@ SOURCE=..\..\slice\Ice\Locator.ice
 

 !IF  "$(CFG)" == "Ice - Win32 Release"

 

+USERDEP__LOCAT="../../bin/slice2cpp.exe"	

+# Begin Custom Build

+InputPath=..\..\slice\Ice\Locator.ice

+

+BuildCmds= \

+	set PATH=%PATH%;..\..\lib \

+	..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/Locator.ice \

+	move Locator.h ..\..\include\Ice \

+	

+

+"..\..\include\Ice\Locator.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"Locator.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

 !ELSEIF  "$(CFG)" == "Ice - Win32 Debug"

 

 USERDEP__LOCAT="../../bin/slice2cpp.exe"	

@@ -1163,6 +1180,18 @@ SOURCE=..\..\slice\Ice\LocatorF.ice
 

 !IF  "$(CFG)" == "Ice - Win32 Release"

 

+USERDEP__LOCATO="../../bin/slice2cpp.exe"	

+# Begin Custom Build

+InputPath=..\..\slice\Ice\LocatorF.ice

+

+"..\..\include\Ice\LocatorF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+	set PATH=%PATH%;..\..\lib 

+	..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/LocatorF.ice 

+	move LocatorF.h ..\..\include\Ice 

+	del LocatorF.cpp 

+	

+# End Custom Build

+

 !ELSEIF  "$(CFG)" == "Ice - Win32 Debug"

 

 USERDEP__LOCATO="../../bin/slice2cpp.exe"	

diff --git a/cpp/src/IcePack/icepackS.dsp b/cpp/src/IcePack/icepackS.dsp
index 8313f6eeb50..b0ad0e6e0cb 100644
--- a/cpp/src/IcePack/icepackS.dsp
+++ b/cpp/src/IcePack/icepackS.dsp
@@ -179,6 +179,22 @@ SOURCE=.\Activator.ice
 

 !IF  "$(CFG)" == "IcePackS - Win32 Release"

 

+USERDEP__ACTIV="../../bin/slice2cpp.exe"	

+# Begin Custom Build

+InputPath=.\Activator.ice

+

+BuildCmds= \

+	set PATH=%PATH%;..\..\lib \

+	..\..\bin\slice2cpp.exe --include-dir IcePack -I../../slice -I.. Activator.ice \

+	

+

+"Activator.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"Activator.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

 !ELSEIF  "$(CFG)" == "IcePackS - Win32 Debug"

 

 USERDEP__ACTIV="../../bin/slice2cpp.exe"	

@@ -206,6 +222,22 @@ SOURCE=.\AdapterManager.ice
 

 !IF  "$(CFG)" == "IcePackS - Win32 Release"

 

+USERDEP__ADAPT="../../bin/slice2cpp.exe"	

+# Begin Custom Build

+InputPath=.\AdapterManager.ice

+

+BuildCmds= \

+	set PATH=%PATH%;..\..\lib \

+	..\..\bin\slice2cpp.exe --include-dir IcePack -I../../slice -I.. AdapterManager.ice \

+	

+

+"AdapterManager.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"AdapterManager.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

 !ELSEIF  "$(CFG)" == "IcePackS - Win32 Debug"

 

 USERDEP__ADAPT="../../bin/slice2cpp.exe"	

@@ -233,6 +265,17 @@ SOURCE=.\AdapterManagerF.ice
 

 !IF  "$(CFG)" == "IcePackS - Win32 Release"

 

+USERDEP__ADAPTE="../../bin/slice2cpp.exe"	

+# Begin Custom Build

+InputPath=.\AdapterManagerF.ice

+

+"AdapterManagerF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+	set PATH=%PATH%;..\..\lib 

+	..\..\bin\slice2cpp.exe --include-dir IcePack -I../../slice -I.. AdapterManagerF.ice 

+	del AdapterManagerF.cpp 

+	

+# End Custom Build

+

 !ELSEIF  "$(CFG)" == "IcePackS - Win32 Debug"

 

 USERDEP__ADAPTE="../../bin/slice2cpp.exe"	

@@ -255,6 +298,22 @@ SOURCE=.\ServerManager.ice
 

 !IF  "$(CFG)" == "IcePackS - Win32 Release"

 

+USERDEP__SERVE="../../bin/slice2cpp.exe"	

+# Begin Custom Build

+InputPath=.\ServerManager.ice

+

+BuildCmds= \

+	set PATH=%PATH%;..\..\lib \

+	..\..\bin\slice2cpp.exe --include-dir IcePack -I../../slice -I.. ServerManager.ice \

+	

+

+"ServerManager.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"ServerManager.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

 !ELSEIF  "$(CFG)" == "IcePackS - Win32 Debug"

 

 USERDEP__SERVE="../../bin/slice2cpp.exe"	

@@ -282,6 +341,17 @@ SOURCE=.\ServerManagerF.ice
 

 !IF  "$(CFG)" == "IcePackS - Win32 Release"

 

+USERDEP__SERVER="../../bin/slice2cpp.exe"	

+# Begin Custom Build

+InputPath=.\ServerManagerF.ice

+

+"ServerManagerF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+	set PATH=%PATH%;..\..\lib 

+	..\..\bin\slice2cpp.exe --include-dir IcePack -I../../slice -I.. ServerManagerF.ice 

+	del ServerManagerF.cpp 

+	

+# End Custom Build

+

 !ELSEIF  "$(CFG)" == "IcePackS - Win32 Debug"

 

 USERDEP__SERVER="../../bin/slice2cpp.exe"	

diff --git a/cpp/test/IceStorm/federation/federationC.dsp b/cpp/test/IceStorm/federation/federationC.dsp
index 8dbbdb7c7b2..c9c5e9cc95b 100644
--- a/cpp/test/IceStorm/federation/federationC.dsp
+++ b/cpp/test/IceStorm/federation/federationC.dsp
@@ -115,6 +115,7 @@ SOURCE=.\Event.ice
 

 !IF  "$(CFG)" == "federationC - Win32 Release"

 

+USERDEP__EVENT="../../../bin/slice2cpp.exe"	

 # Begin Custom Build

 InputPath=.\Event.ice

 

@@ -132,6 +133,7 @@ BuildCmds= \
 

 !ELSEIF  "$(CFG)" == "federationC - Win32 Debug"

 

+USERDEP__EVENT="../../../bin/slice2cpp.exe"	

 # Begin Custom Build

 InputPath=.\Event.ice

 

diff --git a/cpp/test/IceStorm/federation/federationS.dsp b/cpp/test/IceStorm/federation/federationS.dsp
index 9950bd01f9f..11140b631bb 100644
--- a/cpp/test/IceStorm/federation/federationS.dsp
+++ b/cpp/test/IceStorm/federation/federationS.dsp
@@ -115,6 +115,7 @@ SOURCE=.\Event.ice
 

 !IF  "$(CFG)" == "federationS - Win32 Release"

 

+USERDEP__EVENT="../../../bin/slice2cpp.exe"	

 # Begin Custom Build

 InputPath=.\Event.ice

 

@@ -132,6 +133,7 @@ BuildCmds= \
 

 !ELSEIF  "$(CFG)" == "federationS - Win32 Debug"

 

+USERDEP__EVENT="../../../bin/slice2cpp.exe"	

 # Begin Custom Build

 InputPath=.\Event.ice

 

diff --git a/cpp/test/IceStorm/single/singleC.dsp b/cpp/test/IceStorm/single/singleC.dsp
index b0e09473326..efa9308d234 100644
--- a/cpp/test/IceStorm/single/singleC.dsp
+++ b/cpp/test/IceStorm/single/singleC.dsp
@@ -132,6 +132,7 @@ BuildCmds= \
 

 !ELSEIF  "$(CFG)" == "singleC - Win32 Debug"

 

+USERDEP__SINGL="../../../bin/slice2cpp.exe"	

 # Begin Custom Build

 InputPath=.\Single.ice

 

diff --git a/cpp/test/IceStorm/single/singleS.dsp b/cpp/test/IceStorm/single/singleS.dsp
index e5b11797755..3e6e68bc3f6 100644
--- a/cpp/test/IceStorm/single/singleS.dsp
+++ b/cpp/test/IceStorm/single/singleS.dsp
@@ -132,6 +132,7 @@ BuildCmds= \
 

 !ELSEIF  "$(CFG)" == "singleS - Win32 Debug"

 

+USERDEP__SINGL="../../../bin/slice2cpp.exe"	

 # Begin Custom Build

 InputPath=.\Single.ice