summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cppe/all.dsw151
-rw-r--r--cppe/config/Make.rules.AIX2
-rw-r--r--cppe/config/Make.rules.Darwin2
-rw-r--r--cppe/config/Make.rules.FreeBSD2
-rw-r--r--cppe/config/Make.rules.HP-UX2
-rw-r--r--cppe/config/Make.rules.Linux2
-rw-r--r--cppe/config/Make.rules.SunOS2
-rw-r--r--cppe/src/Makefile3
8 files changed, 15 insertions, 151 deletions
diff --git a/cppe/all.dsw b/cppe/all.dsw
index 6618ef130e8..d23cf9b0ce0 100644
--- a/cppe/all.dsw
+++ b/cppe/all.dsw
@@ -18,13 +18,10 @@ Package=<4>
Project_Dep_Name icecpp
End Project Dependency
Begin Project Dependency
- Project_Dep_Name iceutil
- End Project Dependency
- Begin Project Dependency
Project_Dep_Name slice
End Project Dependency
Begin Project Dependency
- Project_Dep_Name slice2cpp
+ Project_Dep_Name slice2cppe
End Project Dependency
}}}
@@ -42,13 +39,10 @@ Package=<4>
Project_Dep_Name ice
End Project Dependency
Begin Project Dependency
- Project_Dep_Name iceutil
- End Project Dependency
- Begin Project Dependency
Project_Dep_Name slice
End Project Dependency
Begin Project Dependency
- Project_Dep_Name slice2cpp
+ Project_Dep_Name slice2cppe
End Project Dependency
}}}
@@ -66,13 +60,10 @@ Package=<4>
Project_Dep_Name ice
End Project Dependency
Begin Project Dependency
- Project_Dep_Name iceutil
- End Project Dependency
- Begin Project Dependency
Project_Dep_Name slice
End Project Dependency
Begin Project Dependency
- Project_Dep_Name slice2cpp
+ Project_Dep_Name slice2cppe
End Project Dependency
}}}
@@ -117,7 +108,7 @@ Package=<4>
Project_Dep_Name interfaceCOL
End Project Dependency
Begin Project Dependency
- Project_Dep_Name slice2cpp
+ Project_Dep_Name slice2cppe
End Project Dependency
Begin Project Dependency
Project_Dep_Name html
@@ -198,9 +189,6 @@ Package=<4>
Project_Dep_Name nestedS
End Project Dependency
Begin Project Dependency
- Project_Dep_Name iceutil
- End Project Dependency
- Begin Project Dependency
Project_Dep_Name facetsC
End Project Dependency
Begin Project Dependency
@@ -539,9 +527,6 @@ Package=<4>
Begin Project Dependency
Project_Dep_Name ice
End Project Dependency
- Begin Project Dependency
- Project_Dep_Name iceutil
- End Project Dependency
}}}
###############################################################################
@@ -557,9 +542,6 @@ Package=<4>
Begin Project Dependency
Project_Dep_Name ice
End Project Dependency
- Begin Project Dependency
- Project_Dep_Name iceutil
- End Project Dependency
}}}
###############################################################################
@@ -576,9 +558,6 @@ Package=<4>
Project_Dep_Name ice
End Project Dependency
Begin Project Dependency
- Project_Dep_Name iceutil
- End Project Dependency
- Begin Project Dependency
Project_Dep_Name icessl
End Project Dependency
}}}
@@ -597,9 +576,6 @@ Package=<4>
Project_Dep_Name ice
End Project Dependency
Begin Project Dependency
- Project_Dep_Name iceutil
- End Project Dependency
- Begin Project Dependency
Project_Dep_Name icessl
End Project Dependency
}}}
@@ -615,7 +591,7 @@ Package=<5>
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name iceutil
+ Project_Dep_Name ice
End Project Dependency
}}}
@@ -632,9 +608,6 @@ Package=<4>
Begin Project Dependency
Project_Dep_Name ice
End Project Dependency
- Begin Project Dependency
- Project_Dep_Name iceutil
- End Project Dependency
}}}
###############################################################################
@@ -650,9 +623,6 @@ Package=<4>
Begin Project Dependency
Project_Dep_Name ice
End Project Dependency
- Begin Project Dependency
- Project_Dep_Name iceutil
- End Project Dependency
}}}
###############################################################################
@@ -668,9 +638,6 @@ Package=<4>
Begin Project Dependency
Project_Dep_Name ice
End Project Dependency
- Begin Project Dependency
- Project_Dep_Name iceutil
- End Project Dependency
}}}
###############################################################################
@@ -686,9 +653,6 @@ Package=<4>
Begin Project Dependency
Project_Dep_Name ice
End Project Dependency
- Begin Project Dependency
- Project_Dep_Name iceutil
- End Project Dependency
}}}
###############################################################################
@@ -704,9 +668,6 @@ Package=<4>
Begin Project Dependency
Project_Dep_Name ice
End Project Dependency
- Begin Project Dependency
- Project_Dep_Name iceutil
- End Project Dependency
}}}
###############################################################################
@@ -722,9 +683,6 @@ Package=<4>
Begin Project Dependency
Project_Dep_Name ice
End Project Dependency
- Begin Project Dependency
- Project_Dep_Name iceutil
- End Project Dependency
}}}
###############################################################################
@@ -740,9 +698,6 @@ Package=<4>
Begin Project Dependency
Project_Dep_Name ice
End Project Dependency
- Begin Project Dependency
- Project_Dep_Name iceutil
- End Project Dependency
}}}
###############################################################################
@@ -758,9 +713,6 @@ Package=<4>
Begin Project Dependency
Project_Dep_Name ice
End Project Dependency
- Begin Project Dependency
- Project_Dep_Name iceutil
- End Project Dependency
}}}
###############################################################################
@@ -777,9 +729,6 @@ Package=<4>
Project_Dep_Name ice
End Project Dependency
Begin Project Dependency
- Project_Dep_Name iceutil
- End Project Dependency
- Begin Project Dependency
Project_Dep_Name icessl
End Project Dependency
}}}
@@ -798,9 +747,6 @@ Package=<4>
Project_Dep_Name ice
End Project Dependency
Begin Project Dependency
- Project_Dep_Name iceutil
- End Project Dependency
- Begin Project Dependency
Project_Dep_Name icessl
End Project Dependency
}}}
@@ -816,27 +762,12 @@ Package=<5>
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name slice2cpp
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name iceutil
+ Project_Dep_Name slice2cppe
End Project Dependency
}}}
###############################################################################
-Project: "iceutil"=.\src\iceutil\iceutil.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
Project: "inheritanceC"=.\test\ice\inheritance\inheritanceC.dsp - Package Owner=<4>
Package=<5>
@@ -848,9 +779,6 @@ Package=<4>
Begin Project Dependency
Project_Dep_Name ice
End Project Dependency
- Begin Project Dependency
- Project_Dep_Name iceutil
- End Project Dependency
}}}
###############################################################################
@@ -866,9 +794,6 @@ Package=<4>
Begin Project Dependency
Project_Dep_Name ice
End Project Dependency
- Begin Project Dependency
- Project_Dep_Name iceutil
- End Project Dependency
}}}
###############################################################################
@@ -884,9 +809,6 @@ Package=<4>
Begin Project Dependency
Project_Dep_Name ice
End Project Dependency
- Begin Project Dependency
- Project_Dep_Name iceutil
- End Project Dependency
}}}
###############################################################################
@@ -903,9 +825,6 @@ Package=<4>
Project_Dep_Name ice
End Project Dependency
Begin Project Dependency
- Project_Dep_Name iceutil
- End Project Dependency
- Begin Project Dependency
Project_Dep_Name icessl
End Project Dependency
}}}
@@ -924,9 +843,6 @@ Package=<4>
Project_Dep_Name ice
End Project Dependency
Begin Project Dependency
- Project_Dep_Name iceutil
- End Project Dependency
- Begin Project Dependency
Project_Dep_Name icessl
End Project Dependency
}}}
@@ -944,9 +860,6 @@ Package=<4>
Begin Project Dependency
Project_Dep_Name ice
End Project Dependency
- Begin Project Dependency
- Project_Dep_Name iceutil
- End Project Dependency
}}}
###############################################################################
@@ -962,9 +875,6 @@ Package=<4>
Begin Project Dependency
Project_Dep_Name ice
End Project Dependency
- Begin Project Dependency
- Project_Dep_Name iceutil
- End Project Dependency
}}}
###############################################################################
@@ -980,9 +890,6 @@ Package=<4>
Begin Project Dependency
Project_Dep_Name ice
End Project Dependency
- Begin Project Dependency
- Project_Dep_Name iceutil
- End Project Dependency
}}}
###############################################################################
@@ -998,9 +905,6 @@ Package=<4>
Begin Project Dependency
Project_Dep_Name ice
End Project Dependency
- Begin Project Dependency
- Project_Dep_Name iceutil
- End Project Dependency
}}}
###############################################################################
@@ -1016,9 +920,6 @@ Package=<4>
Begin Project Dependency
Project_Dep_Name ice
End Project Dependency
- Begin Project Dependency
- Project_Dep_Name iceutil
- End Project Dependency
}}}
###############################################################################
@@ -1034,9 +935,6 @@ Package=<4>
Begin Project Dependency
Project_Dep_Name ice
End Project Dependency
- Begin Project Dependency
- Project_Dep_Name iceutil
- End Project Dependency
}}}
###############################################################################
@@ -1052,9 +950,6 @@ Package=<4>
Begin Project Dependency
Project_Dep_Name ice
End Project Dependency
- Begin Project Dependency
- Project_Dep_Name iceutil
- End Project Dependency
}}}
###############################################################################
@@ -1071,9 +966,6 @@ Package=<4>
Project_Dep_Name ice
End Project Dependency
Begin Project Dependency
- Project_Dep_Name iceutil
- End Project Dependency
- Begin Project Dependency
Project_Dep_Name icessl
End Project Dependency
}}}
@@ -1092,9 +984,6 @@ Package=<4>
Project_Dep_Name ice
End Project Dependency
Begin Project Dependency
- Project_Dep_Name iceutil
- End Project Dependency
- Begin Project Dependency
Project_Dep_Name icessl
End Project Dependency
}}}
@@ -1112,9 +1001,6 @@ Package=<4>
Begin Project Dependency
Project_Dep_Name ice
End Project Dependency
- Begin Project Dependency
- Project_Dep_Name iceutil
- End Project Dependency
}}}
###############################################################################
@@ -1130,9 +1016,6 @@ Package=<4>
Begin Project Dependency
Project_Dep_Name ice
End Project Dependency
- Begin Project Dependency
- Project_Dep_Name iceutil
- End Project Dependency
}}}
###############################################################################
@@ -1148,9 +1031,6 @@ Package=<4>
Begin Project Dependency
Project_Dep_Name ice
End Project Dependency
- Begin Project Dependency
- Project_Dep_Name iceutil
- End Project Dependency
}}}
###############################################################################
@@ -1166,9 +1046,6 @@ Package=<4>
Begin Project Dependency
Project_Dep_Name ice
End Project Dependency
- Begin Project Dependency
- Project_Dep_Name iceutil
- End Project Dependency
}}}
###############################################################################
@@ -1184,9 +1061,6 @@ Package=<4>
Begin Project Dependency
Project_Dep_Name ice
End Project Dependency
- Begin Project Dependency
- Project_Dep_Name iceutil
- End Project Dependency
}}}
###############################################################################
@@ -1200,7 +1074,7 @@ Package=<5>
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name iceutil
+ Project_Dep_Name ice
End Project Dependency
}}}
@@ -1217,9 +1091,6 @@ Package=<4>
Begin Project Dependency
Project_Dep_Name ice
End Project Dependency
- Begin Project Dependency
- Project_Dep_Name iceutil
- End Project Dependency
}}}
###############################################################################
@@ -1235,9 +1106,6 @@ Package=<4>
Begin Project Dependency
Project_Dep_Name ice
End Project Dependency
- Begin Project Dependency
- Project_Dep_Name iceutil
- End Project Dependency
}}}
###############################################################################
@@ -1251,7 +1119,7 @@ Package=<5>
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name iceutil
+ Project_Dep_Name ice
End Project Dependency
}}}
@@ -1265,9 +1133,6 @@ Package=<5>
Package=<4>
{{{
- Begin Project Dependency
- Project_Dep_Name iceutil
- End Project Dependency
}}}
###############################################################################
diff --git a/cppe/config/Make.rules.AIX b/cppe/config/Make.rules.AIX
index 75624b80284..2ab9f730c76 100644
--- a/cppe/config/Make.rules.AIX
+++ b/cppe/config/Make.rules.AIX
@@ -54,7 +54,7 @@ mkshlib = $(CXX) -qmkshrobj $(LDFLAGS) -o $(2) $(3) $(4) ; ar -r
installlib = $(INSTALL) $(2)/$(3) $(1)
-BASELIBS = -lIceEUtil
+BASELIBS =
LIBS = -lIceE $(BASELIBS)
ICEUTIL_OS_LIBS :=
diff --git a/cppe/config/Make.rules.Darwin b/cppe/config/Make.rules.Darwin
index 6e37cf9c19f..014e8f21f61 100644
--- a/cppe/config/Make.rules.Darwin
+++ b/cppe/config/Make.rules.Darwin
@@ -37,7 +37,7 @@ mklibname = lib$(1).dylib
mkshlib = $(CXX) -single_module -dynamiclib $(shlibldflags) -o $(1) -install_name @executable_path/../lib/$(2) $(3) $(4)
-BASELIBS = -lIceEUtil -lpthread
+BASELIBS = -lpthread
LIBS = -lIceE $(BASELIBS)
ICEUTIL_OS_LIBS = -lpthread
diff --git a/cppe/config/Make.rules.FreeBSD b/cppe/config/Make.rules.FreeBSD
index af94c840308..f2a58dfff54 100644
--- a/cppe/config/Make.rules.FreeBSD
+++ b/cppe/config/Make.rules.FreeBSD
@@ -28,7 +28,7 @@ CXXLIBS =
mkshlib = $(CXX) -shared $(LDFLAGS) -o $(1) -Wl,-h,$(2) $(3) $(4) -lc_r
-BASELIBS = -lIceEUtil -lc_r
+BASELIBS = -lc_r
LIBS = -lIceE $(BASELIBS)
ICEUTIL_OS_LIBS =
diff --git a/cppe/config/Make.rules.HP-UX b/cppe/config/Make.rules.HP-UX
index cee9de84bed..b7be2ced9c6 100644
--- a/cppe/config/Make.rules.HP-UX
+++ b/cppe/config/Make.rules.HP-UX
@@ -71,7 +71,7 @@ mksoname = $(if $(2),lib$(1).$(2),lib$(1).sl)
mklibname = lib$(1).sl
mkshlib = $(CXX) -b -Wl,-Bsymbolic $(LDFLAGS) -o $(1) -Wl,+h$(2) $(3) $(4)
-BASELIBS = -lIceEUtil -lxnet -lpthread
+BASELIBS = -lxnet -lpthread
LIBS = -lIceE $(BASELIBS)
ICEUTIL_OS_LIBS := -lpthread -lrt
diff --git a/cppe/config/Make.rules.Linux b/cppe/config/Make.rules.Linux
index 834a8db3227..002212f5421 100644
--- a/cppe/config/Make.rules.Linux
+++ b/cppe/config/Make.rules.Linux
@@ -97,7 +97,7 @@ ifeq ($(CXX),icpc)
endif
-BASELIBS = -lIceEUtil $(STLPORT_LIBS) -lpthread
+BASELIBS = $(STLPORT_LIBS) -lpthread
LIBS = -lIceE $(BASELIBS)
ICEUTIL_OS_LIBS =
diff --git a/cppe/config/Make.rules.SunOS b/cppe/config/Make.rules.SunOS
index a756d203c50..248227c481b 100644
--- a/cppe/config/Make.rules.SunOS
+++ b/cppe/config/Make.rules.SunOS
@@ -99,7 +99,7 @@ ifeq ($(CXX),g++)
mkshlib = $(CXX) -shared $(LDFLAGS) -o $(1) -h $(2) $(3) $(4)
endif
-BASELIBS = -lIceEUtil -lpthread
+BASELIBS = -lpthread
LIBS = -lIceE $(BASELIBS)
ICEUTIL_OS_LIBS := -lpthread -lrt
diff --git a/cppe/src/Makefile b/cppe/src/Makefile
index 6e41f659626..5975862445e 100644
--- a/cppe/src/Makefile
+++ b/cppe/src/Makefile
@@ -11,8 +11,7 @@ top_srcdir = ..
include $(top_srcdir)/config/Make.rules
-SUBDIRS = IceUtil \
- Ice
+SUBDIRS = Ice
$(EVERYTHING)::
@for subdir in $(SUBDIRS); \
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-05 20:14:40 +0000