diff options
| author | Joe George <joe@zeroc.com> | 2016-08-29 14:52:52 -0400 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2016-08-29 14:52:52 -0400 |
| commit | 94df7c9fdc236ef7814a56ba8a5ae2ace5d68195 (patch) | |
| tree | 254b37ee1142f8a3ebbc1ab0105eaa1203d4327b /cpp/src | |
| parent | Fix ICE-7283 - Fix initialization order in LoggerI (diff) | |
| download | ice-94df7c9fdc236ef7814a56ba8a5ae2ace5d68195.tar.bz2 ice-94df7c9fdc236ef7814a56ba8a5ae2ace5d68195.tar.xz ice-94df7c9fdc236ef7814a56ba8a5ae2ace5d68195.zip | |
ICE-7292 - Fix Ruby build on Windows
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IceSSL/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/IceSSL/Makefile b/cpp/src/IceSSL/Makefile index ab3b8222167..a85e403589a 100644 --- a/cpp/src/IceSSL/Makefile +++ b/cpp/src/IceSSL/Makefile @@ -48,14 +48,14 @@ endif endif HDIR = $(headerdir)/IceSSL -SDIR = $(slicedir)/IceSSL +SDIR = $(slicedir)/IceSSL include $(top_srcdir)/config/Make.rules -CPPFLAGS := -I.. $(CPPFLAGS) -DICE_SSL_API_EXPORTS $(OPENSSL_FLAGS) +CPPFLAGS := -I.. $(CPPFLAGS) -DICE_SSL_API_EXPORTS $(OPENSSL_FLAGS) SLICE2CPPFLAGS := --ice --include-dir IceSSL --dll-export ICE_SSL_API $(SLICE2CPPFLAGS) -LINKWITH := $(BZIP2_RPATH_LINK) $(OPENSSL_LIBS) -lIce -lIceUtil $(SSL_OS_LIBS) $(CXXLIBS) +LINKWITH := $(BZIP2_RPATH_LINK) -lIce -lIceUtil $(SSL_OS_LIBS) $(CXXLIBS) ifeq ($(STATICLIBS),yes) $(libdir)/$(LIBNAME): $(OBJS) |