summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp')
-rw-r--r--cpp/demo/IceGrid/simple/application.xml3
-rw-r--r--cpp/src/Ice/ice.dsp4
-rwxr-xr-xcpp/src/IceGrid/icegridadmin.dsp4
3 files changed, 6 insertions, 5 deletions
diff --git a/cpp/demo/IceGrid/simple/application.xml b/cpp/demo/IceGrid/simple/application.xml
index e66dd40e6dc..e3afe6d7f04 100644
--- a/cpp/demo/IceGrid/simple/application.xml
+++ b/cpp/demo/IceGrid/simple/application.xml
@@ -11,9 +11,10 @@
<icegrid>
- <application name="Simple">
+ <application name="Simple" import-default-templates="true">
<node name="localhost">
+ <server-instance template="IcePatch2" directory="."/>
<server id="SimpleServer" exe="./server" activation="on-demand">
<adapter name="Hello" endpoints="tcp" register-process="true">
<object identity="hello" type="::Demo::Hello"/>
diff --git a/cpp/src/Ice/ice.dsp b/cpp/src/Ice/ice.dsp
index 2091c064c4d..221fc094c10 100644
--- a/cpp/src/Ice/ice.dsp
+++ b/cpp/src/Ice/ice.dsp
@@ -1284,7 +1284,7 @@ InputPath=.\EventLoggerMsg.mc
InputName=EventLoggerMsg
BuildCmds= \
- mc $(InputPath) \
+ mc "$(InputPath)" \
rc -r -fo $(InputName).res $(InputName).rc \
@@ -1302,7 +1302,7 @@ InputPath=.\EventLoggerMsg.mc
InputName=EventLoggerMsg
BuildCmds= \
- mc $(InputPath) \
+ mc "$(InputPath)" \
rc -r -fo $(InputName).res $(InputName).rc \
diff --git a/cpp/src/IceGrid/icegridadmin.dsp b/cpp/src/IceGrid/icegridadmin.dsp
index 10e85cce07a..4691edf26ab 100755
--- a/cpp/src/IceGrid/icegridadmin.dsp
+++ b/cpp/src/IceGrid/icegridadmin.dsp
@@ -184,7 +184,7 @@ USERDEP__FILEP="..\..\bin\slice2cpp.exe" "..\..\lib\slice.lib"
InputPath=..\..\slice\IceGrid\FileParser.ice
BuildCmds= \
- ..\..\bin\slice2cpp.exe --ice --include-dir IceGrid -I../../slice $(InputPath) \
+ ..\..\bin\slice2cpp.exe --ice --include-dir IceGrid -I../../slice "$(InputPath)" \
move FileParser.h ..\..\include\IceGrid \
@@ -202,7 +202,7 @@ USERDEP__FILEP="..\..\bin\slice2cpp.exe" "..\..\lib\sliced.lib"
InputPath=..\..\slice\IceGrid\FileParser.ice
BuildCmds= \
- ..\..\bin\slice2cpp.exe --ice --include-dir IceGrid -I../../slice $(InputPath) \
+ ..\..\bin\slice2cpp.exe --ice --include-dir IceGrid -I../../slice "$(InputPath)" \
move FileParser.h ..\..\include\IceGrid \