summaryrefslogtreecommitdiff
path: root/cpp/src/slice2js
diff options
context:
space:
mode:
authorJoe George <joe@zeroc.com>2014-09-05 15:24:15 -0230
committerJoe George <joe@zeroc.com>2014-09-05 15:24:15 -0230
commita3a7a19af2c48ef4911f5c4dcccab118c279f333 (patch)
tree4c19c7ba3145674ca0aa2679f1422519495b83c4 /cpp/src/slice2js
parentICE-5659 remove Ice.MonitorConnections from properties (diff)
downloadice-a3a7a19af2c48ef4911f5c4dcccab118c279f333.tar.bz2
ice-a3a7a19af2c48ef4911f5c4dcccab118c279f333.tar.xz
ice-a3a7a19af2c48ef4911f5c4dcccab118c279f333.zip
ICE-5658 - NPM support for IceJS distribution
Diffstat (limited to 'cpp/src/slice2js')
-rw-r--r--cpp/src/slice2js/Makefile.mak2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/slice2js/Makefile.mak b/cpp/src/slice2js/Makefile.mak
index 58bf485669a..6a242f68577 100644
--- a/cpp/src/slice2js/Makefile.mak
+++ b/cpp/src/slice2js/Makefile.mak
@@ -30,7 +30,7 @@ PDBFLAGS = /pdb:$(NAME:.exe=.pdb)
RES_FILE = Slice2Js.res
$(NAME): $(OBJS) Slice2Js.res
- $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS)slice$(LIBSUFFIX).lib \
+ $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(SETARGV) $(PREOUT)$@ $(SLICE_LIBS) \
$(BASELIBS) $(RES_FILE)
@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
$(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest