diff options
author | Matthew Newhook <matthew@zeroc.com> | 2007-03-02 02:18:42 +0000 |
---|---|---|
committer | Matthew Newhook <matthew@zeroc.com> | 2007-03-02 02:18:42 +0000 |
commit | 25355489dfd1d25f7d100c1413678eb2db1eb22f (patch) | |
tree | d811a00e7fe2eb8b77508449d1d90306eacfa302 /cpp | |
parent | Fixed bug #1936 (diff) | |
download | ice-25355489dfd1d25f7d100c1413678eb2db1eb22f.tar.bz2 ice-25355489dfd1d25f7d100c1413678eb2db1eb22f.tar.xz ice-25355489dfd1d25f7d100c1413678eb2db1eb22f.zip |
http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=1958
Diffstat (limited to 'cpp')
-rw-r--r-- | cpp/src/IcePatch2/Makefile.mak | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/cpp/src/IcePatch2/Makefile.mak b/cpp/src/IcePatch2/Makefile.mak index 163bc9ac312..9d5fed805e8 100644 --- a/cpp/src/IcePatch2/Makefile.mak +++ b/cpp/src/IcePatch2/Makefile.mak @@ -78,17 +78,20 @@ $(DLLNAME): $(OBJS) @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp) $(SERVER): $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) icepatch2$(LIBSUFFIX).lib + $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) \ + icepatch2$(LIBSUFFIX).lib @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest security.manifest -outputresource:$@;#1 && del /q $@.manifest $(CLIENT): $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) icepatch2$(LIBSUFFIX).lib + $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) \ + icepatch2$(LIBSUFFIX).lib @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest security.manifest -outputresource:$@;#1 && del /q $@.manifest $(CALC): $(CALCOBJS) - $(LINK) $(LD_EXEFLAGS) $(CAPDBFLAGS) $(CALCOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) icepatch2$(LIBSUFFIX).lib + $(LINK) $(LD_EXEFLAGS) $(CAPDBFLAGS) $(SETARGV) $(CALCOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) \ + icepatch2$(LIBSUFFIX).lib @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest security.manifest -outputresource:$@;#1 && del /q $@.manifest |