summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorMatthew Newhook <matthew@zeroc.com>2001-12-05 16:19:59 +0000
committerMatthew Newhook <matthew@zeroc.com>2001-12-05 16:19:59 +0000
commit2aed72d252fb4bbc31ad3b6d90c24e69a8a21354 (patch)
tree444dae6b5a4f30ce2f67979fa0ccbed4a58132e8 /cpp/src
parentAdded Freeze/Complex test to WIN32 build. (diff)
downloadice-2aed72d252fb4bbc31ad3b6d90c24e69a8a21354.tar.bz2
ice-2aed72d252fb4bbc31ad3b6d90c24e69a8a21354.tar.xz
ice-2aed72d252fb4bbc31ad3b6d90c24e69a8a21354.zip
Update IceStorm for WIN32 build.
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/IceStorm/Makefile2
-rw-r--r--cpp/src/IceStorm/dummy.ice0
-rw-r--r--cpp/src/IceStorm/icestormS.dsp34
3 files changed, 35 insertions, 1 deletions
diff --git a/cpp/src/IceStorm/Makefile b/cpp/src/IceStorm/Makefile
index 618794080ec..f328abc62d6 100644
--- a/cpp/src/IceStorm/Makefile
+++ b/cpp/src/IceStorm/Makefile
@@ -42,7 +42,7 @@ SRCS = $(OBJS:.o=.cpp) \
HDIR = $(includedir)/IceStorm
SDIR = $(slicedir)/IceStorm
SLICECMD = $(SLICE2CPP) --include-dir IceStorm --dll-export ICE_STORM_API -I$(slicedir)
-SLICE2FREEZECMD = $(SLICE2FREEZE) --include-dir IceStorm --dll-export ICE_STORM_API -I$(slicedir)
+SLICE2FREEZECMD = $(SLICE2FREEZE) --include-dir IceStorm
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/src/IceStorm/dummy.ice b/cpp/src/IceStorm/dummy.ice
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/cpp/src/IceStorm/dummy.ice
diff --git a/cpp/src/IceStorm/icestormS.dsp b/cpp/src/IceStorm/icestormS.dsp
index bf328e4285b..c3377447ef8 100644
--- a/cpp/src/IceStorm/icestormS.dsp
+++ b/cpp/src/IceStorm/icestormS.dsp
@@ -97,6 +97,10 @@ SOURCE=.\Server.cpp
# End Source File
# Begin Source File
+SOURCE=.\StringBoolDict.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\Subscriber.cpp
# End Source File
# Begin Source File
@@ -129,6 +133,10 @@ SOURCE=.\IceStormI.h
# End Source File
# Begin Source File
+SOURCE=.\StringBoolDict.h
+# End Source File
+# Begin Source File
+
SOURCE=.\Subscriber.h
# End Source File
# Begin Source File
@@ -159,6 +167,32 @@ SOURCE=.\TraceLevelsF.h
# Begin Group "Resource Files"
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# Begin Source File
+
+SOURCE=.\dummy.ice
+
+!IF "$(CFG)" == "IceStormS - Win32 Release"
+
+!ELSEIF "$(CFG)" == "IceStormS - Win32 Debug"
+
+# Begin Custom Build
+InputPath=.\dummy.ice
+
+BuildCmds= \
+ set PATH=%PATH%;..\..\lib \
+ ..\..\bin\slice2freeze.exe --include-dir IceStorm --dict IceStorm::StringBoolDict,string,bool StringBoolDict \
+
+
+"StringBoolDict.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"StringBoolDict.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ENDIF
+
+# End Source File
# End Group
# End Target
# End Project