diff options
| author | Jose <jose@zeroc.com> | 2016-07-01 18:50:05 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-07-01 19:10:17 +0200 |
| commit | bbbcf7e1b1be7c78c86f5c9c9f28880f7ec4cec0 (patch) | |
| tree | 035f56429cccdd3c519a6792d4f54dbe4953a6cf /cpp/src/IceUtil | |
| parent | Fix (ICE-7200) - _tempnam usage in Windows (diff) | |
| download | ice-bbbcf7e1b1be7c78c86f5c9c9f28880f7ec4cec0.tar.bz2 ice-bbbcf7e1b1be7c78c86f5c9c9f28880f7ec4cec0.tar.xz ice-bbbcf7e1b1be7c78c86f5c9c9f28880f7ec4cec0.zip | |
OpenSSL-1.1.0-pre5 support
Conflicts:
cpp/src/Ice/PropertyNames.cpp
cpp/src/Ice/PropertyNames.h
csharp/src/Ice/PropertyNames.cs
java/src/Ice/src/main/java/IceInternal/PropertyNames.java
js/src/Ice/PropertyNames.js
Diffstat (limited to 'cpp/src/IceUtil')
| -rw-r--r-- | cpp/src/IceUtil/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/IceUtil/Makefile b/cpp/src/IceUtil/Makefile index 934522baa08..b14150f19bf 100644 --- a/cpp/src/IceUtil/Makefile +++ b/cpp/src/IceUtil/Makefile @@ -40,7 +40,7 @@ OBJS = ArgVector.o \ include $(top_srcdir)/config/Make.rules -CPPFLAGS := $(CPPFLAGS) $(ICEUTIL_FLAGS) -DICE_UTIL_API_EXPORTS -I.. +CPPFLAGS := $(CPPFLAGS) $(ICEUTIL_FLAGS) $(OPENSSL_FLAGS) -DICE_UTIL_API_EXPORTS -I.. LINKWITH := $(ICEUTIL_OS_LIBS) ifeq ($(STATICLIBS),yes) |