summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xcpp/demo/Freeze/casino/casinoS.dsp8
-rwxr-xr-xcpp/demo/Freeze/phonebook/phonebookC.dsp8
-rwxr-xr-xcpp/demo/Freeze/phonebook/phonebookCOL.dsp10
-rwxr-xr-xcpp/demo/Freeze/phonebook/phonebookS.dsp10
-rwxr-xr-xcpp/demo/Glacier2/chat/chatC.dsp30
-rwxr-xr-xcpp/demo/Glacier2/chat/chatS.dsp8
-rwxr-xr-xcpp/demo/Ice/bidir/bidirC.dsp8
-rwxr-xr-xcpp/demo/Ice/bidir/bidirS.dsp8
-rwxr-xr-x[-rw-r--r--]cpp/demo/Ice/callback/callbackC.dsp26
-rwxr-xr-xcpp/demo/book/printer/printerC.dsp8
10 files changed, 104 insertions, 20 deletions
diff --git a/cpp/demo/Freeze/casino/casinoS.dsp b/cpp/demo/Freeze/casino/casinoS.dsp
index 4463cb05aa4..3c2280b8ccd 100755
--- a/cpp/demo/Freeze/casino/casinoS.dsp
+++ b/cpp/demo/Freeze/casino/casinoS.dsp
@@ -198,7 +198,9 @@ SOURCE=.\CasinoStore.ice
InputPath=.\CasinoStore.ice
BuildCmds= \
- ..\..\..\bin\slice2cpp.exe -I. -I..\..\..\..\slice CasinoStore.ice
+ if exist ../../../slice (set sliceDir=../../../slice) else set sliceDir=../../../../slice \
+ ..\..\..\bin\slice2cpp.exe -I. -I%slicedir% CasinoStore.ice \
+
"CasinoStore.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -213,7 +215,9 @@ BuildCmds= \
InputPath=.\CasinoStore.ice
BuildCmds= \
- ..\..\..\bin\slice2cpp.exe -I. -I..\..\..\..\slice CasinoStore.ice
+ if exist ../../../slice (set sliceDir=../../../slice) else set sliceDir=../../../../slice \
+ ..\..\..\bin\slice2cpp.exe -I. -I%slicedir% CasinoStore.ice \
+
"CasinoStore.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/cpp/demo/Freeze/phonebook/phonebookC.dsp b/cpp/demo/Freeze/phonebook/phonebookC.dsp
index 507006e4b88..589a88feeb1 100755
--- a/cpp/demo/Freeze/phonebook/phonebookC.dsp
+++ b/cpp/demo/Freeze/phonebook/phonebookC.dsp
@@ -187,7 +187,9 @@ USERDEP__PHONE="..\..\..\bin\slice2cpp.exe" "..\..\..\bin\slice2freeze.exe" "..\
InputPath=.\PhoneBook.ice
BuildCmds= \
- ..\..\..\bin\slice2cpp.exe -I../../../../slice PhoneBook.ice
+ if exist ../../../slice (set sliceDir=../../../slice) else set sliceDir=../../../../slice \
+ ..\..\..\bin\slice2cpp.exe -I%sliceDir% PhoneBook.ice \
+
"PhoneBook.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -203,7 +205,9 @@ USERDEP__PHONE="..\..\..\bin\slice2cpp.exe" "..\..\..\bin\slice2freeze.exe" "..\
InputPath=.\PhoneBook.ice
BuildCmds= \
- ..\..\..\bin\slice2cpp.exe -I../../../../slice PhoneBook.ice
+ if exist ../../../slice (set sliceDir=../../../slice) else set sliceDir=../../../../slice \
+ ..\..\..\bin\slice2cpp.exe -I%sliceDir% PhoneBook.ice \
+
"PhoneBook.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/cpp/demo/Freeze/phonebook/phonebookCOL.dsp b/cpp/demo/Freeze/phonebook/phonebookCOL.dsp
index 4b8c10cd1c6..01c1ae4705e 100755
--- a/cpp/demo/Freeze/phonebook/phonebookCOL.dsp
+++ b/cpp/demo/Freeze/phonebook/phonebookCOL.dsp
@@ -211,8 +211,9 @@ USERDEP__PHONE="..\..\..\bin\slice2cpp.exe" "..\..\..\bin\slice2freeze.exe" "..\
InputPath=.\PhoneBook.ice
BuildCmds= \
- ..\..\..\bin\slice2cpp.exe -I../../../../slice PhoneBook.ice \
- ..\..\..\bin\slice2freeze.exe -I../../../../slice --index NameIndex,Demo::Contact,name,case-insensitive NameIndex PhoneBook.ice \
+ if exist ../../../slice (set sliceDir=../../../slice) else set sliceDir=../../../../slice \
+ ..\..\..\bin\slice2cpp.exe -I%sliceDir% PhoneBook.ice \
+ ..\..\..\bin\slice2freeze.exe -I%sliceDir% --index NameIndex,Demo::Contact,name,case-insensitive NameIndex PhoneBook.ice \
"PhoneBook.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -235,8 +236,9 @@ USERDEP__PHONE="..\..\..\bin\slice2cpp.exe" "..\..\..\bin\slice2freeze.exe" "..\
InputPath=.\PhoneBook.ice
BuildCmds= \
- ..\..\..\bin\slice2cpp.exe -I../../../../slice PhoneBook.ice \
- ..\..\..\bin\slice2freeze.exe -I../../../../slice --index NameIndex,Demo::Contact,name,case-insensitive NameIndex PhoneBook.ice \
+ if exist ../../../slice (set sliceDir=../../../slice) else set sliceDir=../../../../slice \
+ ..\..\..\bin\slice2cpp.exe -I%sliceDir% PhoneBook.ice \
+ ..\..\..\bin\slice2freeze.exe -I%sliceDir% --index NameIndex,Demo::Contact,name,case-insensitive NameIndex PhoneBook.ice \
"PhoneBook.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
diff --git a/cpp/demo/Freeze/phonebook/phonebookS.dsp b/cpp/demo/Freeze/phonebook/phonebookS.dsp
index de7749f58f1..d543bdfc61f 100755
--- a/cpp/demo/Freeze/phonebook/phonebookS.dsp
+++ b/cpp/demo/Freeze/phonebook/phonebookS.dsp
@@ -144,8 +144,9 @@ USERDEP__PHONE="..\..\..\bin\slice2cpp.exe" "..\..\..\bin\slice2freeze.exe" "..\
InputPath=.\PhoneBook.ice
BuildCmds= \
- ..\..\..\bin\slice2cpp.exe -I../../../slice PhoneBook.ice \
- ..\..\..\bin\slice2freeze.exe -I../../../../slice --index NameIndex,Demo::Contact,name,case-insensitive NameIndex PhoneBook.ice \
+ if exist ../../../slice (set sliceDir=../../../slice) else set sliceDir=../../../../slice \
+ ..\..\..\bin\slice2cpp.exe -I%sliceDir% PhoneBook.ice \
+ ..\..\..\bin\slice2freeze.exe -I%sliceDir% --index NameIndex,Demo::Contact,name,case-insensitive NameIndex PhoneBook.ice \
"PhoneBook.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -168,8 +169,9 @@ USERDEP__PHONE="..\..\..\bin\slice2cpp.exe" "..\..\..\bin\slice2freeze.exe" "..\
InputPath=.\PhoneBook.ice
BuildCmds= \
- ..\..\..\bin\slice2cpp.exe -I../../../slice PhoneBook.ice \
- ..\..\..\bin\slice2freeze.exe -I../../../../slice --index NameIndex,Demo::Contact,name,case-insensitive NameIndex PhoneBook.ice \
+ if exist ../../../slice (set sliceDir=../../../slice) else set sliceDir=../../../../slice \
+ ..\..\..\bin\slice2cpp.exe -I%sliceDir% PhoneBook.ice \
+ ..\..\..\bin\slice2freeze.exe -I%sliceDir% --index NameIndex,Demo::Contact,name,case-insensitive NameIndex PhoneBook.ice \
"PhoneBook.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
diff --git a/cpp/demo/Glacier2/chat/chatC.dsp b/cpp/demo/Glacier2/chat/chatC.dsp
index e3b9e168173..9e7ac4b6aa2 100755
--- a/cpp/demo/Glacier2/chat/chatC.dsp
+++ b/cpp/demo/Glacier2/chat/chatC.dsp
@@ -53,6 +53,21 @@ 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 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 Ice.lib IceUtil.lib Glacier2.lib setargv.obj /nologo /subsystem:console /pdb:none /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no
# SUBTRACT LINK32 /debug
+# Begin Custom Build
+InputPath=.\client.exe
+SOURCE="$(InputPath)"
+
+BuildCmds= \
+ if exist ../../../slice (set sliceDir=../../../slice) else set sliceDir=../../../../slice \
+ ..\..\..\bin\slice2cpp.exe -I%sliceDir% Chat.ice \
+
+
+"Chat.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"Chat.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
!ELSEIF "$(CFG)" == "chatC - Win32 Debug"
@@ -79,6 +94,21 @@ 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 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 Iced.lib IceUtild.lib Glacier2d.lib setargv.obj /nologo /subsystem:console /debug /machine:I386 /out:"client.exe" /pdbtype:sept /libpath:"../../../lib" /FIXED:no
# SUBTRACT LINK32 /pdb:none
+# Begin Custom Build
+InputPath=.\client.exe
+SOURCE="$(InputPath)"
+
+BuildCmds= \
+ if exist ../../../slice (set sliceDir=../../../slice) else set sliceDir=../../../../slice \
+ ..\..\..\bin\slice2cpp.exe -I%sliceDir% Chat.ice \
+
+
+"Chat.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"Chat.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
!ENDIF
diff --git a/cpp/demo/Glacier2/chat/chatS.dsp b/cpp/demo/Glacier2/chat/chatS.dsp
index 74c9a89ead8..56462e7495c 100755
--- a/cpp/demo/Glacier2/chat/chatS.dsp
+++ b/cpp/demo/Glacier2/chat/chatS.dsp
@@ -128,7 +128,9 @@ USERDEP__CHAT_="..\..\..\bin\slice2cpp.exe" "..\..\..\lib\slice.lib"
InputPath=.\Chat.ice
BuildCmds= \
- ..\..\..\bin\slice2cpp.exe -I../../../../slice Chat.ice
+ if exist ../../../slice (set sliceDir=../../../slice) else set sliceDir=../../../../slice \
+ ..\..\..\bin\slice2cpp.exe -I%sliceDir% Chat.ice \
+
"Chat.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -144,7 +146,9 @@ USERDEP__CHAT_="..\..\..\bin\slice2cpp.exe" "..\..\..\lib\sliced.lib"
InputPath=.\Chat.ice
BuildCmds= \
- ..\..\..\bin\slice2cpp.exe -I../../../../slice Chat.ice
+ if exist ../../../slice (set sliceDir=../../../slice) else set sliceDir=../../../../slice \
+ ..\..\..\bin\slice2cpp.exe -I%sliceDir% Chat.ice \
+
"Chat.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/cpp/demo/Ice/bidir/bidirC.dsp b/cpp/demo/Ice/bidir/bidirC.dsp
index 8c9dee50b7d..5e9f2dab913 100755
--- a/cpp/demo/Ice/bidir/bidirC.dsp
+++ b/cpp/demo/Ice/bidir/bidirC.dsp
@@ -120,7 +120,9 @@ USERDEP__CALLB="..\..\..\bin\slice2cpp.exe" "..\..\..\lib\slice.lib"
InputPath=.\Callback.ice
BuildCmds= \
- ..\..\..\bin\slice2cpp.exe -I../../../../slice Callback.ice
+ if exist ../../../slice (set sliceDir=../../../slice) else set sliceDir=../../../../slice \
+ ..\..\..\bin\slice2cpp.exe -I%sliceDir% Callback.ice \
+
"Callback.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -136,7 +138,9 @@ USERDEP__CALLB="..\..\..\bin\slice2cpp.exe" "..\..\..\lib\sliced.lib"
InputPath=.\Callback.ice
BuildCmds= \
- ..\..\..\bin\slice2cpp.exe -I../../../../slice Callback.ice
+ if exist ../../../slice (set sliceDir=../../../slice) else set sliceDir=../../../../slice \
+ ..\..\..\bin\slice2cpp.exe -I%sliceDir% Callback.ice \
+
"Callback.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/cpp/demo/Ice/bidir/bidirS.dsp b/cpp/demo/Ice/bidir/bidirS.dsp
index 642ef863ce3..9b091c44d08 100755
--- a/cpp/demo/Ice/bidir/bidirS.dsp
+++ b/cpp/demo/Ice/bidir/bidirS.dsp
@@ -128,7 +128,9 @@ USERDEP__CALLB="..\..\..\bin\slice2cpp.exe" "..\..\..\lib\slice.lib"
InputPath=.\Callback.ice
BuildCmds= \
- ..\..\..\bin\slice2cpp.exe -I../../../../slice Callback.ice
+ if exist ../../../slice (set sliceDir=../../../slice) else set sliceDir=../../../../slice \
+ ..\..\..\bin\slice2cpp.exe -I%sliceDir% Callback.ice \
+
"Callback.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -144,7 +146,9 @@ USERDEP__CALLB="..\..\..\bin\slice2cpp.exe" "..\..\..\lib\sliced.lib"
InputPath=.\Callback.ice
BuildCmds= \
- ..\..\..\bin\slice2cpp.exe -I../../../../slice Callback.ice
+ if exist ../../../slice (set sliceDir=../../../slice) else set sliceDir=../../../../slice \
+ ..\..\..\bin\slice2cpp.exe -I%sliceDir% Callback.ice \
+
"Callback.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/cpp/demo/Ice/callback/callbackC.dsp b/cpp/demo/Ice/callback/callbackC.dsp
index 08d7bc606eb..71106235101 100644..100755
--- a/cpp/demo/Ice/callback/callbackC.dsp
+++ b/cpp/demo/Ice/callback/callbackC.dsp
@@ -53,6 +53,19 @@ 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 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 Ice.lib IceUtil.lib setargv.obj /nologo /subsystem:console /pdb:none /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no
# SUBTRACT LINK32 /debug
+# Begin Custom Build
+InputPath=.\client.exe
+SOURCE="$(InputPath)"
+
+BuildCmds= \
+ ..\..\..\bin\slice2cpp.exe Callback.ice
+
+"Callback.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"Callback.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
!ELSEIF "$(CFG)" == "callbackC - Win32 Debug"
@@ -79,6 +92,19 @@ 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 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 Iced.lib IceUtild.lib setargv.obj /nologo /subsystem:console /debug /machine:I386 /out:"client.exe" /pdbtype:sept /libpath:"../../../lib" /FIXED:no
# SUBTRACT LINK32 /pdb:none
+# Begin Custom Build
+InputPath=.\client.exe
+SOURCE="$(InputPath)"
+
+BuildCmds= \
+ ..\..\..\bin\slice2cpp.exe Callback.ice
+
+"Callback.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"Callback.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
!ENDIF
diff --git a/cpp/demo/book/printer/printerC.dsp b/cpp/demo/book/printer/printerC.dsp
index 785e0cbb51e..12360132301 100755
--- a/cpp/demo/book/printer/printerC.dsp
+++ b/cpp/demo/book/printer/printerC.dsp
@@ -120,7 +120,9 @@ USERDEP__PRINT="../../../bin/slice2cpp.exe"
InputPath=.\Printer.ice
BuildCmds= \
- ..\..\..\bin\slice2cpp.exe -I../../../../slice Printer.ice
+ if exist ../../../slice (set sliceDir=../../../slice) else set sliceDir=../../../../slice \
+ ..\..\..\bin\slice2cpp.exe -I%sliceDir% Printer.ice \
+
"Printer.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -136,7 +138,9 @@ USERDEP__PRINT="..\..\..\bin\slice2cpp.exe"
InputPath=.\Printer.ice
BuildCmds= \
- ..\..\..\bin\slice2cpp.exe -I../../../../slice Printer.ice
+ if exist ../../../slice (set sliceDir=../../../slice) else set sliceDir=../../../../slice \
+ ..\..\..\bin\slice2cpp.exe -I%sliceDir% Printer.ice \
+
"Printer.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)