diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-04-01 14:29:51 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-04-01 14:29:51 +0200 |
| commit | 619f6c628cd80b53033c72e09cf20f1a2daea6eb (patch) | |
| tree | e74b103d060d6c31eb4d98651ca4b154e7f51d48 /cpp | |
| parent | Moved ant task to its own repository (diff) | |
| download | ice-619f6c628cd80b53033c72e09cf20f1a2daea6eb.tar.bz2 ice-619f6c628cd80b53033c72e09cf20f1a2daea6eb.tar.xz ice-619f6c628cd80b53033c72e09cf20f1a2daea6eb.zip | |
SSL fixes
- Fixed SChannel to correctly handles certificate chains from PKCS12 files
- Fixed Java IceSSL to require password for PKCS12
- Fixed Windows test build issue
Diffstat (limited to 'cpp')
| -rwxr-xr-x | cpp/test/Ice/services/Makefile.mak | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/cpp/test/Ice/services/Makefile.mak b/cpp/test/Ice/services/Makefile.mak new file mode 100755 index 00000000000..cc420e2189a --- /dev/null +++ b/cpp/test/Ice/services/Makefile.mak @@ -0,0 +1,36 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +top_srcdir = ..\..\.. + +CLIENT = client.exe + +TARGETS = $(CLIENT) + +SLICE_OBJS = .\Test.obj + +OBJS = $(SLICE_OBJS) \ + .\Client.obj \ + .\AllTests.obj + +!include $(top_srcdir)/config/Make.rules.mak + +CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN + +!if "$(GENERATE_PDB)" == "yes" +PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) +!endif + +$(CLIENT): $(OBJS) + $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ + $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest + +clean:: + del /q Test.cpp Test.h |