diff options
| author | Jose <jose@zeroc.com> | 2014-10-08 22:50:42 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-10-08 22:50:42 +0200 |
| commit | 26ecc85f7f8a9cc3ebf2944b642dbd9a6b246d75 (patch) | |
| tree | 821b68838f70b01b093470cd77c3806f0d51cff9 /cpp/src | |
| parent | makedist fix to JS assets generation (diff) | |
| download | ice-26ecc85f7f8a9cc3ebf2944b642dbd9a6b246d75.tar.bz2 ice-26ecc85f7f8a9cc3ebf2944b642dbd9a6b246d75.tar.xz ice-26ecc85f7f8a9cc3ebf2944b642dbd9a6b246d75.zip | |
minor build fixes
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/Makefile | 2 | ||||
| -rw-r--r-- | cpp/src/IceSSL/Makefile | 20 |
2 files changed, 17 insertions, 5 deletions
diff --git a/cpp/src/Ice/Makefile b/cpp/src/Ice/Makefile index 671a8c47928..1398ab5d07a 100644 --- a/cpp/src/Ice/Makefile +++ b/cpp/src/Ice/Makefile @@ -121,7 +121,6 @@ OBJS = Acceptor.o \ RouterInfo.o \ Selector.o \ ServantManager.o \ - Service.o \ SliceChecksums.o \ SlicedData.o \ Stream.o \ @@ -147,6 +146,7 @@ OBJS = Acceptor.o \ ifeq ($(findstring MINGW,$(shell uname)),) OBJS := $(OBJS) \ + Service.o \ SysLoggerI.o endif diff --git a/cpp/src/IceSSL/Makefile b/cpp/src/IceSSL/Makefile index 1bb0aa353bf..f69a7491095 100644 --- a/cpp/src/IceSSL/Makefile +++ b/cpp/src/IceSSL/Makefile @@ -24,17 +24,29 @@ OBJS = AcceptorI.o \ ConnectorI.o \ EndpointI.o \ Instance.o \ - OpenSSLEngine.o \ - OpenSSLTransceiverI.o \ PluginI.o \ RFC2253.o \ - SecureTransportEngine.o \ - SecureTransportTransceiverI.o \ SSLEngine.o \ TrustManager.o \ Util.o \ $(SLICE_OBJS) +ifneq ($(findstring MINGW,$(shell uname)),) +OBJS := $(OBJS) \ + SChannelEngine.o \ + SChannelTransceiverI.o +else +ifeq ($(shell uname),Darwin) +OBJS := $(OBJS) \ + SecureTransportEngine.o \ + SecureTransportTransceiverI.o +else +OBJS := $(OBJS) \ + OpenSSLEngine.o \ + OpenSSLTransceiverI.o +endif +endif + HDIR = $(headerdir)/IceSSL SDIR = $(slicedir)/IceSSL |