diff options
| author | Jose <jose@zeroc.com> | 2016-03-21 22:41:06 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-03-21 22:41:06 +0100 |
| commit | 89125e72090c84592a888dacf8fa851cc8769fa1 (patch) | |
| tree | 83a3ca8150e0633cdbee985d37176e97c4019c9b | |
| parent | Exception stack trace updates (diff) | |
| download | ice-89125e72090c84592a888dacf8fa851cc8769fa1.tar.bz2 ice-89125e72090c84592a888dacf8fa851cc8769fa1.tar.xz ice-89125e72090c84592a888dacf8fa851cc8769fa1.zip | |
WinRT objects tests build fixes
| -rw-r--r-- | cpp/test/Ice/objects/Makefile.mak | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/test/Ice/objects/Makefile.mak b/cpp/test/Ice/objects/Makefile.mak index 4ca162861c2..e7663ccf563 100644 --- a/cpp/test/Ice/objects/Makefile.mak +++ b/cpp/test/Ice/objects/Makefile.mak @@ -22,7 +22,7 @@ OBJDIR = winrt CLIENT = $(NAME_PREFIX)client SERVER = $(NAME_PREFIX)server COLLOCATED = $(NAME_PREFIX)collocated -TESTLIBNAME = libTestDerived.lib +TESTLIBNAME = $(OBJDIR)\libTestDerived.lib TARGETS = $(CLIENT)$(EXT) $(SERVER)$(EXT) $(COLLOCATED)$(EXT) $(TESTLIBNAME) @@ -64,7 +64,7 @@ $(TESTLIBNAME): $(SLICE_OBJS) $(AR) $(ARFLAGS) $(SLICE_OBJS) /out:$(TESTLIBNAME) $(CLIENT)$(EXT): $(COBJS) $(TESTLIBNAME) - $(LINK) $(LD_TESTFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) libTestDerived.lib + $(LINK) $(LD_TESTFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) $(OBJDIR)\libTestDerived.lib @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest |