diff options
| author | Jose <jose@zeroc.com> | 2014-12-12 13:49:02 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-12-12 13:49:02 +0100 |
| commit | ae49d959c67f084e8fb18b86f3dca67b011e845f (patch) | |
| tree | b8a7a9581938a0f7bbe38ca1f6f1ec9d074e7e6a /cpp | |
| parent | Fixed ICE-6073 - background test failure on Ubuntu (diff) | |
| download | ice-ae49d959c67f084e8fb18b86f3dca67b011e845f.tar.bz2 ice-ae49d959c67f084e8fb18b86f3dca67b011e845f.tar.xz ice-ae49d959c67f084e8fb18b86f3dca67b011e845f.zip | |
Fixed (ICE-6156) - C++ objects specified more than once warning
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/test/Ice/plugin/Makefile.mak | 2 | ||||
| -rw-r--r-- | cpp/test/IceGrid/session/Makefile.mak | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/cpp/test/Ice/plugin/Makefile.mak b/cpp/test/Ice/plugin/Makefile.mak index 4511be18997..3dd6e8b7dd0 100644 --- a/cpp/test/Ice/plugin/Makefile.mak +++ b/cpp/test/Ice/plugin/Makefile.mak @@ -58,7 +58,7 @@ $(PLUGINDIR)\$(DLLNAME): $(POBJS) @if exist $(PLUGINDIR)\$(DLLNAME:.dll=.exp) del /q $(PLUGINDIR)\$(DLLNAME:.dll=.exp) $(CLIENT)$(EXT): $(COBJS) - $(LINK) $(LD_TESTFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) + $(LINK) $(LD_TESTFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/test/IceGrid/session/Makefile.mak b/cpp/test/IceGrid/session/Makefile.mak index 458e07d9d6f..38c43455faa 100644 --- a/cpp/test/IceGrid/session/Makefile.mak +++ b/cpp/test/IceGrid/session/Makefile.mak @@ -25,8 +25,7 @@ SOBJS = $(SLICE_OBJS) \ .\Server.obj VOBJS = $(SLICE_OBJS) \ - .\PermissionsVerifier.obj \ - .\Test.obj + .\PermissionsVerifier.obj OBJS = $(COBJS) \ $(SOBJS) \ |