summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2007-01-31 17:47:24 +0000
committerDwayne Boone <dwayne@zeroc.com>2007-01-31 17:47:24 +0000
commit37d30194ce9b6992b6fbc2361960d7d045be155d (patch)
tree2dabf9fc02c1be5d51d56504933f032862f8554e /cpp
parentdisable assertions in finalizers (diff)
downloadice-37d30194ce9b6992b6fbc2361960d7d045be155d.tar.bz2
ice-37d30194ce9b6992b6fbc2361960d7d045be155d.tar.xz
ice-37d30194ce9b6992b6fbc2361960d7d045be155d.zip
Fixed bug 1720
Diffstat (limited to 'cpp')
-rw-r--r--cpp/src/Ice/Makefile.mak4
1 files changed, 3 insertions, 1 deletions
diff --git a/cpp/src/Ice/Makefile.mak b/cpp/src/Ice/Makefile.mak
index 34fe301fdde..a8066dd6f94 100644
--- a/cpp/src/Ice/Makefile.mak
+++ b/cpp/src/Ice/Makefile.mak
@@ -112,8 +112,10 @@ CPPFLAGS = -I.. $(CPPFLAGS) -DICE_API_EXPORTS -DFD_SETSIZE=1024 -DWIN32_LEAN_AND
SLICE2CPPFLAGS = --ice --include-dir Ice --dll-export ICE_API $(SLICE2CPPFLAGS)
LINKWITH = $(BASELIBS) $(BZIP2_LIBS) $(ICE_OS_LIBS) ws2_32.lib
-!if "$(CPP_COMPILER)" != "BCC2006" & "$(OPTIMIZE)" != "yes"
+!if "$(CPP_COMPILER)" != "BCC2006"
+!if "$(OPTIMIZE)" != "yes"
PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb)
+!endif
LD_DLLFLAGS = $(LD_DLLFLAGS) /entry:"ice_DLL_Main"
!endif