summaryrefslogtreecommitdiff
path: root/cpp/src/slice2cppe
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2008-04-04 09:55:15 -0230
committerDwayne Boone <dwayne@zeroc.com>2008-04-04 09:55:15 -0230
commiteac6b3e8cca36264f6a3ba3bafb365ef58fb1783 (patch)
tree230ddea5d84c41897ee1d48ac19fc4ea0df0a0db /cpp/src/slice2cppe
parentBug 2991 - installation of policy files (previous changed didn't work for GAC... (diff)
downloadice-eac6b3e8cca36264f6a3ba3bafb365ef58fb1783.tar.bz2
ice-eac6b3e8cca36264f6a3ba3bafb365ef58fb1783.tar.xz
ice-eac6b3e8cca36264f6a3ba3bafb365ef58fb1783.zip
Port to CodeGear C++Builder 2007
Diffstat (limited to 'cpp/src/slice2cppe')
-rw-r--r--cpp/src/slice2cppe/Makefile.mak12
1 files changed, 9 insertions, 3 deletions
diff --git a/cpp/src/slice2cppe/Makefile.mak b/cpp/src/slice2cppe/Makefile.mak
index 956d83bd492..3680bd5b7d1 100644
--- a/cpp/src/slice2cppe/Makefile.mak
+++ b/cpp/src/slice2cppe/Makefile.mak
@@ -26,9 +26,15 @@ CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
PDBFLAGS = /pdb:$(NAME:.exe=.pdb)
!endif
+!if "$(CPP_COMPILER)" == "BCC2007"
+RES_FILE = ,, Slice2CppE.res
+!else
+RES_FILE = Slice2CppE.res
+!endif
+
$(NAME): $(OBJS) Slice2CppE.res
- $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) Slice2CppE.res $(SETARGV) $(PREOUT)$@ \
- $(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS)
+ $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS)slice$(LIBSUFFIX).lib \
+ $(BASELIBS) $(RES_FILE)
@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
$(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
@@ -44,7 +50,7 @@ install:: all
!if "$(OPTIMIZE)" != "yes"
-!if "$(CPP_COMPILER)" == "BCC2006"
+!if "$(CPP_COMPILER)" == "BCC2007"
install:: all
copy $(NAME:.exe=.tds) $(install_bindir)