summaryrefslogtreecommitdiff
path: root/cpp/demo
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/demo')
-rwxr-xr-xcpp/demo/Database/Oracle/occi/Makefile.mak2
-rwxr-xr-xcpp/demo/Database/Oracle/proc/Makefile.mak2
-rw-r--r--cpp/demo/Freeze/bench/Makefile.mak2
-rw-r--r--cpp/demo/Freeze/library/Makefile.mak2
-rw-r--r--cpp/demo/Freeze/phonebook/Makefile.mak2
-rw-r--r--cpp/demo/Glacier2/callback/Makefile.mak2
-rw-r--r--cpp/demo/Glacier2/chat/Makefile.mak2
-rwxr-xr-xcpp/demo/Ice/MFC/client/Makefile.mak2
-rwxr-xr-xcpp/demo/Ice/MFC/server/Makefile.mak2
-rw-r--r--cpp/demo/Ice/Makefile.mak2
-rw-r--r--cpp/demo/Ice/async/Consumer.cpp2
-rw-r--r--cpp/demo/Ice/async/Makefile.mak2
-rw-r--r--cpp/demo/Ice/bidir/Makefile.mak2
-rw-r--r--cpp/demo/Ice/callback/Makefile.mak2
-rw-r--r--cpp/demo/Ice/converter/Makefile.mak2
-rw-r--r--cpp/demo/Ice/hello/Makefile.mak2
-rw-r--r--cpp/demo/Ice/hello/config.client2
-rw-r--r--cpp/demo/Ice/hello/config.server2
-rw-r--r--cpp/demo/Ice/invoke/Makefile.mak2
-rw-r--r--cpp/demo/Ice/latency/Makefile.mak2
-rw-r--r--cpp/demo/Ice/minimal/Makefile.mak2
-rw-r--r--cpp/demo/Ice/nested/Makefile.mak2
-rw-r--r--cpp/demo/Ice/session/Makefile.mak2
-rw-r--r--cpp/demo/Ice/throughput/Makefile.mak2
-rw-r--r--cpp/demo/Ice/value/Makefile.mak2
-rw-r--r--cpp/demo/IceBox/hello/Makefile.mak2
-rw-r--r--cpp/demo/IceGrid/allocate/Makefile.mak2
-rw-r--r--cpp/demo/IceGrid/sessionActivation/Makefile.mak2
-rw-r--r--cpp/demo/IceGrid/simple/Makefile.mak2
-rwxr-xr-xcpp/demo/IcePatch2/MFC/Makefile.mak2
-rw-r--r--cpp/demo/IceStorm/clock/Makefile.mak2
-rw-r--r--cpp/demo/IceStorm/counter/Makefile.mak2
-rw-r--r--cpp/demo/IceStorm/replicated/Makefile.mak2
-rw-r--r--cpp/demo/IceUtil/workqueue/Makefile.mak2
-rw-r--r--cpp/demo/Makefile.mak2
-rw-r--r--cpp/demo/book/printer/Makefile.mak2
-rw-r--r--cpp/demo/book/simple_filesystem/Makefile.mak2
37 files changed, 38 insertions, 36 deletions
diff --git a/cpp/demo/Database/Oracle/occi/Makefile.mak b/cpp/demo/Database/Oracle/occi/Makefile.mak
index 2a34d7e0c37..0e40a4f5fb0 100755
--- a/cpp/demo/Database/Oracle/occi/Makefile.mak
+++ b/cpp/demo/Database/Oracle/occi/Makefile.mak
@@ -36,7 +36,7 @@ SRCS = $(OBJS:.obj=.cpp) \
CPPFLAGS = -I. -I$(ORACLE_HOME)\precomp\public $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-!if "$(BORLAND_HOME)" == "" & "$(OPTIMIZE)" != "yes"
+!if "$(CPP_COMPILER)" != "BCC2006" & "$(OPTIMIZE)" != "yes"
CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
!endif
diff --git a/cpp/demo/Database/Oracle/proc/Makefile.mak b/cpp/demo/Database/Oracle/proc/Makefile.mak
index 9a61c1b1630..e42c3eb6902 100755
--- a/cpp/demo/Database/Oracle/proc/Makefile.mak
+++ b/cpp/demo/Database/Oracle/proc/Makefile.mak
@@ -49,7 +49,7 @@ ORACLE_LIBS = -L$(ORACLE_HOME)\precomp\lib orasql10$(LIBSUFFIX).lib
proc threads=yes parse=none lines=yes code=cpp cpp_suffix=cpp close_on_commit=yes $<
del /q tp* $*.lis
-!if "$(BORLAND_HOME)" == "" & "$(OPTIMIZE)" != "yes"
+!if "$(CPP_COMPILER)" != "BCC2006" & "$(OPTIMIZE)" != "yes"
CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
!endif
diff --git a/cpp/demo/Freeze/bench/Makefile.mak b/cpp/demo/Freeze/bench/Makefile.mak
index 3cdde23350d..1e5cd9c5548 100644
--- a/cpp/demo/Freeze/bench/Makefile.mak
+++ b/cpp/demo/Freeze/bench/Makefile.mak
@@ -21,7 +21,7 @@ SRCS = $(OBJS:.obj=.cpp)
CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-!if "$(BORLAND_HOME)" == "" & "$(OPTIMIZE)" != "yes"
+!if "$(CPP_COMPILER)" != "BCC2006" & "$(OPTIMIZE)" != "yes"
PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
!endif
diff --git a/cpp/demo/Freeze/library/Makefile.mak b/cpp/demo/Freeze/library/Makefile.mak
index 1d79b5a2be7..c7df0aa32a3 100644
--- a/cpp/demo/Freeze/library/Makefile.mak
+++ b/cpp/demo/Freeze/library/Makefile.mak
@@ -47,7 +47,7 @@ SRCS = $(OBJS:.obj=.cpp) \
CPPFLAGS = -I. -Idummyinclude $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
SLICE2CPPFLAGS = --ice $(SLICE2CPPFLAGS)
-!if "$(BORLAND_HOME)" == "" & "$(OPTIMIZE)" != "yes"
+!if "$(CPP_COMPILER)" != "BCC2006" & "$(OPTIMIZE)" != "yes"
CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
COPDBFLAGS = /pdb:$(COLLOCATED:.exe=.pdb)
diff --git a/cpp/demo/Freeze/phonebook/Makefile.mak b/cpp/demo/Freeze/phonebook/Makefile.mak
index 6a18a8fe4ba..73eae7765b6 100644
--- a/cpp/demo/Freeze/phonebook/Makefile.mak
+++ b/cpp/demo/Freeze/phonebook/Makefile.mak
@@ -46,7 +46,7 @@ SRCS = $(OBJS:.obj=.cpp) \
CPPFLAGS = -I. -Idummyinclude $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-!if "$(BORLAND_HOME)" == "" & "$(OPTIMIZE)" != "yes"
+!if "$(CPP_COMPILER)" != "BCC2006" & "$(OPTIMIZE)" != "yes"
CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
COPDBFLAGS = /pdb:$(COLLOCATED:.exe=.pdb)
diff --git a/cpp/demo/Glacier2/callback/Makefile.mak b/cpp/demo/Glacier2/callback/Makefile.mak
index e421c048601..4ce4101c921 100644
--- a/cpp/demo/Glacier2/callback/Makefile.mak
+++ b/cpp/demo/Glacier2/callback/Makefile.mak
@@ -34,7 +34,7 @@ SRCS = $(OBJS:.obj=.cpp) \
CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-!if "$(BORLAND_HOME)" == "" & "$(OPTIMIZE)" != "yes"
+!if "$(CPP_COMPILER)" != "BCC2006" & "$(OPTIMIZE)" != "yes"
CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
SSPDBFLAGS = /pdb:$(SESSION_SERVER:.exe=.pdb)
diff --git a/cpp/demo/Glacier2/chat/Makefile.mak b/cpp/demo/Glacier2/chat/Makefile.mak
index 05087d61ea5..bbb48fd7687 100644
--- a/cpp/demo/Glacier2/chat/Makefile.mak
+++ b/cpp/demo/Glacier2/chat/Makefile.mak
@@ -29,7 +29,7 @@ SRCS = $(OBJS:.obj=.cpp) \
CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-!if "$(BORLAND_HOME)" == "" & "$(OPTIMIZE)" != "yes"
+!if "$(CPP_COMPILER)" != "BCC2006" & "$(OPTIMIZE)" != "yes"
CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
!endif
diff --git a/cpp/demo/Ice/MFC/client/Makefile.mak b/cpp/demo/Ice/MFC/client/Makefile.mak
index 77870e21753..800c7920818 100755
--- a/cpp/demo/Ice/MFC/client/Makefile.mak
+++ b/cpp/demo/Ice/MFC/client/Makefile.mak
@@ -24,7 +24,7 @@ SRCS = $(OBJS:.obj=.cpp)
CPPFLAGS = -I. $(CPPFLAGS) -D_AFXDLL -DVC_EXTRALEAN
-!if "$(BORLAND_HOME)" == "" & "$(OPTIMIZE)" != "yes"
+!if "$(CPP_COMPILER)" != "BCC2006" & "$(OPTIMIZE)" != "yes"
PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
!endif
diff --git a/cpp/demo/Ice/MFC/server/Makefile.mak b/cpp/demo/Ice/MFC/server/Makefile.mak
index 8643c8d3640..93e53fa0243 100755
--- a/cpp/demo/Ice/MFC/server/Makefile.mak
+++ b/cpp/demo/Ice/MFC/server/Makefile.mak
@@ -26,7 +26,7 @@ SRCS = $(OBJS:.obj=.cpp)
CPPFLAGS = -I. $(CPPFLAGS) -D_AFXDLL -DVC_EXTRALEAN
-!if "$(BORLAND_HOME)" == "" & "$(OPTIMIZE)" != "yes"
+!if "$(CPP_COMPILER)" != "BCC2006" & "$(OPTIMIZE)" != "yes"
PDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
!endif
diff --git a/cpp/demo/Ice/Makefile.mak b/cpp/demo/Ice/Makefile.mak
index 9f952c2415c..528ce26ce3c 100644
--- a/cpp/demo/Ice/Makefile.mak
+++ b/cpp/demo/Ice/Makefile.mak
@@ -24,7 +24,7 @@ SUBDIRS = minimal \
converter \
async
-!if "$(BORLAND_HOME)" == ""
+!if "$(CPP_COMPILER)" != "BCC2006" & "$(CPP_COMPILER)" != "VC80_EXPRESS"
SUBDIRS = $(SUBDIRS) MFC
!endif
diff --git a/cpp/demo/Ice/async/Consumer.cpp b/cpp/demo/Ice/async/Consumer.cpp
index b49079207e7..d3dcf32c577 100644
--- a/cpp/demo/Ice/async/Consumer.cpp
+++ b/cpp/demo/Ice/async/Consumer.cpp
@@ -115,6 +115,7 @@ QueueConsumer::run(int argc, char* argv[])
//
// Cancel any outstanding requests.
//
+ /*
IceUtil::StaticMutex::Lock lock(requestsMutex);
if(requests.size() != 0)
{
@@ -132,6 +133,7 @@ QueueConsumer::run(int argc, char* argv[])
// Ignore
}
}
+ */
return EXIT_SUCCESS;
}
diff --git a/cpp/demo/Ice/async/Makefile.mak b/cpp/demo/Ice/async/Makefile.mak
index 6143c7f914f..30bbbaccc2c 100644
--- a/cpp/demo/Ice/async/Makefile.mak
+++ b/cpp/demo/Ice/async/Makefile.mak
@@ -33,7 +33,7 @@ SRCS = $(OBJS:.obj=.cpp) \
CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-!if "$(BORLAND_HOME)" == "" & "$(OPTIMIZE)" != "yes"
+!if "$(CPP_COMPILER)" != "BCC2006" & "$(OPTIMIZE)" != "yes"
PPDBFLAGS = /pdb:$(PUBLISHER:.exe=.pdb)
CPDBFLAGS = /pdb:$(CONSUMER:.exe=.pdb)
SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
diff --git a/cpp/demo/Ice/bidir/Makefile.mak b/cpp/demo/Ice/bidir/Makefile.mak
index 3c2cb155356..9d7ad7582ad 100644
--- a/cpp/demo/Ice/bidir/Makefile.mak
+++ b/cpp/demo/Ice/bidir/Makefile.mak
@@ -29,7 +29,7 @@ SRCS = $(OBJS:.obj=.cpp) \
CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-!if "$(BORLAND_HOME)" == "" & "$(OPTIMIZE)" != "yes"
+!if "$(CPP_COMPILER)" != "BCC2006" & "$(OPTIMIZE)" != "yes"
CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
!endif
diff --git a/cpp/demo/Ice/callback/Makefile.mak b/cpp/demo/Ice/callback/Makefile.mak
index 4d51294d52e..6c442e3e5ec 100644
--- a/cpp/demo/Ice/callback/Makefile.mak
+++ b/cpp/demo/Ice/callback/Makefile.mak
@@ -29,7 +29,7 @@ SRCS = $(OBJS:.obj=.cpp) \
CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-!if "$(BORLAND_HOME)" == "" & "$(OPTIMIZE)" != "yes"
+!if "$(CPP_COMPILER)" != "BCC2006" & "$(OPTIMIZE)" != "yes"
CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
!endif
diff --git a/cpp/demo/Ice/converter/Makefile.mak b/cpp/demo/Ice/converter/Makefile.mak
index fa3c5a7fb07..5050c3367e4 100644
--- a/cpp/demo/Ice/converter/Makefile.mak
+++ b/cpp/demo/Ice/converter/Makefile.mak
@@ -30,7 +30,7 @@ SRCS = $(OBJS:.obj=.cpp) \
CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-!if "$(BORLAND_HOME)" == "" & "$(OPTIMIZE)" != "yes"
+!if "$(CPP_COMPILER)" != "BCC2006" & "$(OPTIMIZE)" != "yes"
CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
!endif
diff --git a/cpp/demo/Ice/hello/Makefile.mak b/cpp/demo/Ice/hello/Makefile.mak
index 216b22ab62c..4b0c9ac61dd 100644
--- a/cpp/demo/Ice/hello/Makefile.mak
+++ b/cpp/demo/Ice/hello/Makefile.mak
@@ -29,7 +29,7 @@ SRCS = $(OBJS:.obj=.cpp) \
CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-!if "$(BORLAND_HOME)" == "" & "$(OPTIMIZE)" != "yes"
+!if "$(CPP_COMPILER)" != "BCC2006" & "$(OPTIMIZE)" != "yes"
CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
!endif
diff --git a/cpp/demo/Ice/hello/config.client b/cpp/demo/Ice/hello/config.client
index 4c70261fe76..cbd0cd02039 100644
--- a/cpp/demo/Ice/hello/config.client
+++ b/cpp/demo/Ice/hello/config.client
@@ -2,7 +2,7 @@
# The client reads this property to create the reference to the
# "hello" object in the server.
#
-Hello.Proxy=hello:tcp -p 10000:udp -p 10000:ssl -p 10001
+Hello.Proxy=hello:tcp -p 10000:udp -c -p 10000 -h 127.0.0.1:ssl -p 10001
#
# Warn about connection exceptions
diff --git a/cpp/demo/Ice/hello/config.server b/cpp/demo/Ice/hello/config.server
index aeff24452ac..5057b6ddaca 100644
--- a/cpp/demo/Ice/hello/config.server
+++ b/cpp/demo/Ice/hello/config.server
@@ -3,7 +3,7 @@
# "Hello". The following line sets the endpoints for this
# adapter.
#
-Ice.OA.Hello.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001
+Ice.OA.Hello.Endpoints=tcp -p 10000:udp -c -p 10000 -h 127.0.0.1:ssl -p 10001
#
# Warn about connection exceptions
diff --git a/cpp/demo/Ice/invoke/Makefile.mak b/cpp/demo/Ice/invoke/Makefile.mak
index 3d25409606d..be2eee222ef 100644
--- a/cpp/demo/Ice/invoke/Makefile.mak
+++ b/cpp/demo/Ice/invoke/Makefile.mak
@@ -30,7 +30,7 @@ SRCS = $(OBJS:.obj=.cpp) \
SLICE2CPPFLAGS = --stream $(SLICE2CPPFLAGS)
CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-!if "$(BORLAND_HOME)" == "" & "$(OPTIMIZE)" != "yes"
+!if "$(CPP_COMPILER)" != "BCC2006" & "$(OPTIMIZE)" != "yes"
CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
!endif
diff --git a/cpp/demo/Ice/latency/Makefile.mak b/cpp/demo/Ice/latency/Makefile.mak
index e02a17e3ab7..c86bb80b50c 100644
--- a/cpp/demo/Ice/latency/Makefile.mak
+++ b/cpp/demo/Ice/latency/Makefile.mak
@@ -28,7 +28,7 @@ SRCS = $(OBJS:.obj=.cpp) \
CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-!if "$(BORLAND_HOME)" == "" & "$(OPTIMIZE)" != "yes"
+!if "$(CPP_COMPILER)" != "BCC2006" & "$(OPTIMIZE)" != "yes"
CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
!endif
diff --git a/cpp/demo/Ice/minimal/Makefile.mak b/cpp/demo/Ice/minimal/Makefile.mak
index 216b22ab62c..4b0c9ac61dd 100644
--- a/cpp/demo/Ice/minimal/Makefile.mak
+++ b/cpp/demo/Ice/minimal/Makefile.mak
@@ -29,7 +29,7 @@ SRCS = $(OBJS:.obj=.cpp) \
CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-!if "$(BORLAND_HOME)" == "" & "$(OPTIMIZE)" != "yes"
+!if "$(CPP_COMPILER)" != "BCC2006" & "$(OPTIMIZE)" != "yes"
CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
!endif
diff --git a/cpp/demo/Ice/nested/Makefile.mak b/cpp/demo/Ice/nested/Makefile.mak
index d4bfe5e00cc..493862a6e38 100644
--- a/cpp/demo/Ice/nested/Makefile.mak
+++ b/cpp/demo/Ice/nested/Makefile.mak
@@ -29,7 +29,7 @@ SRCS = $(OBJS:.obj=.cpp) \
CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-!if "$(BORLAND_HOME)" == "" & "$(OPTIMIZE)" != "yes"
+!if "$(CPP_COMPILER)" != "BCC2006" & "$(OPTIMIZE)" != "yes"
CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
!endif
diff --git a/cpp/demo/Ice/session/Makefile.mak b/cpp/demo/Ice/session/Makefile.mak
index 6bcabfc5c0a..45cfa79b44c 100644
--- a/cpp/demo/Ice/session/Makefile.mak
+++ b/cpp/demo/Ice/session/Makefile.mak
@@ -31,7 +31,7 @@ SRCS = $(OBJS:.obj=.cpp) \
CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-!if "$(BORLAND_HOME)" == "" & "$(OPTIMIZE)" != "yes"
+!if "$(CPP_COMPILER)" != "BCC2006" & "$(OPTIMIZE)" != "yes"
CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
!endif
diff --git a/cpp/demo/Ice/throughput/Makefile.mak b/cpp/demo/Ice/throughput/Makefile.mak
index 224f454e1ff..38738ae8e7c 100644
--- a/cpp/demo/Ice/throughput/Makefile.mak
+++ b/cpp/demo/Ice/throughput/Makefile.mak
@@ -29,7 +29,7 @@ SRCS = $(OBJS:.obj=.cpp) \
CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-!if "$(BORLAND_HOME)" == "" & "$(OPTIMIZE)" != "yes"
+!if "$(CPP_COMPILER)" != "BCC2006" & "$(OPTIMIZE)" != "yes"
CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
!endif
diff --git a/cpp/demo/Ice/value/Makefile.mak b/cpp/demo/Ice/value/Makefile.mak
index 9d6c4fd72bc..c337a15df85 100644
--- a/cpp/demo/Ice/value/Makefile.mak
+++ b/cpp/demo/Ice/value/Makefile.mak
@@ -30,7 +30,7 @@ SRCS = $(OBJS:.obj=.cpp) \
CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-!if "$(BORLAND_HOME)" == "" & "$(OPTIMIZE)" != "yes"
+!if "$(CPP_COMPILER)" != "BCC2006" & "$(OPTIMIZE)" != "yes"
CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
!endif
diff --git a/cpp/demo/IceBox/hello/Makefile.mak b/cpp/demo/IceBox/hello/Makefile.mak
index 94d2d3d84fd..ec6ce0b6304 100644
--- a/cpp/demo/IceBox/hello/Makefile.mak
+++ b/cpp/demo/IceBox/hello/Makefile.mak
@@ -34,7 +34,7 @@ SLICE_SRCS = Hello.ice
CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
LINKWITH = $(LIBS) icebox$(LIBSUFFIX).lib
-!if "$(BORLAND_HOME)" == "" & "$(OPTIMIZE)" != "yes"
+!if "$(CPP_COMPILER)" != "BCC2006" & "$(OPTIMIZE)" != "yes"
PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb)
CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
!endif
diff --git a/cpp/demo/IceGrid/allocate/Makefile.mak b/cpp/demo/IceGrid/allocate/Makefile.mak
index 0ef5d36c9a8..d92ed9f84a0 100644
--- a/cpp/demo/IceGrid/allocate/Makefile.mak
+++ b/cpp/demo/IceGrid/allocate/Makefile.mak
@@ -29,7 +29,7 @@ SRCS = $(OBJS:.obj=.cpp) \
CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-!if "$(BORLAND_HOME)" == "" & "$(OPTIMIZE)" != "yes"
+!if "$(CPP_COMPILER)" != "BCC2006" & "$(OPTIMIZE)" != "yes"
CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
!endif
diff --git a/cpp/demo/IceGrid/sessionActivation/Makefile.mak b/cpp/demo/IceGrid/sessionActivation/Makefile.mak
index a3dd3e826ef..9cc92cd08d4 100644
--- a/cpp/demo/IceGrid/sessionActivation/Makefile.mak
+++ b/cpp/demo/IceGrid/sessionActivation/Makefile.mak
@@ -29,7 +29,7 @@ SRCS = $(OBJS:.obj=.cpp) \
CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-!if "$(BORLAND_HOME)" == "" & "$(OPTIMIZE)" != "yes"
+!if "$(CPP_COMPILER)" != "BCC2006" & "$(OPTIMIZE)" != "yes"
CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
!endif
diff --git a/cpp/demo/IceGrid/simple/Makefile.mak b/cpp/demo/IceGrid/simple/Makefile.mak
index 0ef5d36c9a8..d92ed9f84a0 100644
--- a/cpp/demo/IceGrid/simple/Makefile.mak
+++ b/cpp/demo/IceGrid/simple/Makefile.mak
@@ -29,7 +29,7 @@ SRCS = $(OBJS:.obj=.cpp) \
CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-!if "$(BORLAND_HOME)" == "" & "$(OPTIMIZE)" != "yes"
+!if "$(CPP_COMPILER)" != "BCC2006" & "$(OPTIMIZE)" != "yes"
CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
!endif
diff --git a/cpp/demo/IcePatch2/MFC/Makefile.mak b/cpp/demo/IcePatch2/MFC/Makefile.mak
index 872f2915ce5..7d9437c389e 100755
--- a/cpp/demo/IcePatch2/MFC/Makefile.mak
+++ b/cpp/demo/IcePatch2/MFC/Makefile.mak
@@ -24,7 +24,7 @@ SRCS = $(OBJS:.obj=.cpp)
CPPFLAGS = -I. $(CPPFLAGS) -D_AFXDLL -DVC_EXTRALEAN -D_UNICODE
LINKWITH = icepatch2$(LIBSUFFIX).lib $(LIBS)
-!if "$(BORLAND_HOME)" == "" & "$(OPTIMIZE)" != "yes"
+!if "$(CPP_COMPILER)" != "BCC2006" & "$(OPTIMIZE)" != "yes"
PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
!endif
diff --git a/cpp/demo/IceStorm/clock/Makefile.mak b/cpp/demo/IceStorm/clock/Makefile.mak
index f581cfec690..582462b42d5 100644
--- a/cpp/demo/IceStorm/clock/Makefile.mak
+++ b/cpp/demo/IceStorm/clock/Makefile.mak
@@ -30,7 +30,7 @@ SRCS = $(OBJS:.obj=.cpp) \
CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
LIBS = $(top_srcdir)\lib\icestorm$(LIBSUFFIX).lib $(LIBS)
-!if "$(BORLAND_HOME)" == "" & "$(OPTIMIZE)" != "yes"
+!if "$(CPP_COMPILER)" != "BCC2006" & "$(OPTIMIZE)" != "yes"
PPDBFLAGS = /pdb:$(PUBLISHER:.exe=.pdb)
SPDBFLAGS = /pdb:$(SUBSCRIBER:.exe=.pdb)
!endif
diff --git a/cpp/demo/IceStorm/counter/Makefile.mak b/cpp/demo/IceStorm/counter/Makefile.mak
index 32e9a37b03c..20fb5d42f29 100644
--- a/cpp/demo/IceStorm/counter/Makefile.mak
+++ b/cpp/demo/IceStorm/counter/Makefile.mak
@@ -32,7 +32,7 @@ SRCS = $(OBJS:.obj=.cpp) \
CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
IS_LIBS = $(top_srcdir)\lib\icestorm$(LIBSUFFIX).lib $(LIBS)
-!if "$(BORLAND_HOME)" == "" & "$(OPTIMIZE)" != "yes"
+!if "$(CPP_COMPILER)" != "BCC2006" & "$(OPTIMIZE)" != "yes"
PPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
!endif
diff --git a/cpp/demo/IceStorm/replicated/Makefile.mak b/cpp/demo/IceStorm/replicated/Makefile.mak
index d511f5ee830..b79c96c4fbf 100644
--- a/cpp/demo/IceStorm/replicated/Makefile.mak
+++ b/cpp/demo/IceStorm/replicated/Makefile.mak
@@ -30,7 +30,7 @@ SRCS = $(OBJS:.obj=.cpp) \
CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
LIBS = $(top_srcdir)\lib\icestorm$(LIBSUFFIX).lib $(top_srcdir)\lib\icegrid$(LIBSUFFIX).lib $(LIBS)
-!if "$(BORLAND_HOME)" == "" & "$(OPTIMIZE)" != "yes"
+!if "$(CPP_COMPILER)" != "BCC2006" & "$(OPTIMIZE)" != "yes"
PPDBFLAGS = /pdb:$(PUBLISHER:.exe=.pdb)
SPDBFLAGS = /pdb:$(SUBSCRIBER:.exe=.pdb)
!endif
diff --git a/cpp/demo/IceUtil/workqueue/Makefile.mak b/cpp/demo/IceUtil/workqueue/Makefile.mak
index c1fec0336c7..50e8c5c94a5 100644
--- a/cpp/demo/IceUtil/workqueue/Makefile.mak
+++ b/cpp/demo/IceUtil/workqueue/Makefile.mak
@@ -21,7 +21,7 @@ SRCS = $(OBJS:.obj=.cpp)
CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-!if "$(BORLAND_HOME)" == "" & "$(OPTIMIZE)" != "yes"
+!if "$(CPP_COMPILER)" != "BCC2006" & "$(OPTIMIZE)" != "yes"
PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
!endif
diff --git a/cpp/demo/Makefile.mak b/cpp/demo/Makefile.mak
index 890fa44efd6..eed89838760 100644
--- a/cpp/demo/Makefile.mak
+++ b/cpp/demo/Makefile.mak
@@ -20,7 +20,7 @@ SUBDIRS = IceUtil \
IceGrid \
book
-!if "$(BORLAND_HOME)" == ""
+!if "$(CPP_COMPILER)" != "BCC2006" & "$(CPP_COMPILER)" != "VC80_EXPRESS"
SUBDIRS = $(SUBDIRS) IcePatch2
!endif
diff --git a/cpp/demo/book/printer/Makefile.mak b/cpp/demo/book/printer/Makefile.mak
index 82418a2c130..6e45ea64a6b 100644
--- a/cpp/demo/book/printer/Makefile.mak
+++ b/cpp/demo/book/printer/Makefile.mak
@@ -28,7 +28,7 @@ SRCS = $(OBJS:.obj=.cpp) \
CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-!if "$(BORLAND_HOME)" == "" & "$(OPTIMIZE)" != "yes"
+!if "$(CPP_COMPILER)" != "BCC2006" & "$(OPTIMIZE)" != "yes"
CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
!endif
diff --git a/cpp/demo/book/simple_filesystem/Makefile.mak b/cpp/demo/book/simple_filesystem/Makefile.mak
index 25db337f47c..cecddfdb55a 100644
--- a/cpp/demo/book/simple_filesystem/Makefile.mak
+++ b/cpp/demo/book/simple_filesystem/Makefile.mak
@@ -29,7 +29,7 @@ SRCS = $(OBJS:.obj=.cpp) \
CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-!if "$(BORLAND_HOME)" == "" & "$(OPTIMIZE)" != "yes"
+!if "$(CPP_COMPILER)" != "BCC2006" & "$(OPTIMIZE)" != "yes"
CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
!endif
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-05 13:35:19 +0000