diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Freeze/Makefile | 1 | ||||
| -rw-r--r-- | cpp/src/Glacier2Lib/Makefile | 2 | ||||
| -rw-r--r-- | cpp/src/Ice/DynamicLibrary.cpp | 12 | ||||
| -rw-r--r-- | cpp/src/Ice/Makefile | 1 | ||||
| -rw-r--r-- | cpp/src/IceGridLib/Makefile | 1 | ||||
| -rw-r--r-- | cpp/src/IcePatch2Lib/Makefile | 1 | ||||
| -rw-r--r-- | cpp/src/IceSSL/Makefile | 2 | ||||
| -rw-r--r-- | cpp/src/IceStormLib/Makefile | 1 | ||||
| -rw-r--r-- | cpp/src/IceUtil/Makefile | 2 |
9 files changed, 19 insertions, 4 deletions
diff --git a/cpp/src/Freeze/Makefile b/cpp/src/Freeze/Makefile index 7c1439d7286..419f956b0b3 100644 --- a/cpp/src/Freeze/Makefile +++ b/cpp/src/Freeze/Makefile @@ -12,6 +12,7 @@ top_srcdir = ../.. LIBFILENAME = $(call mklibfilename,Freeze,$(VERSION)) SONAME = $(call mksoname,Freeze,$(SOVERSION)) LIBNAME = $(call mklibname,Freeze) +FRAMEWORK = Freeze TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME)) diff --git a/cpp/src/Glacier2Lib/Makefile b/cpp/src/Glacier2Lib/Makefile index 32685bcad13..59ca9d5cd49 100644 --- a/cpp/src/Glacier2Lib/Makefile +++ b/cpp/src/Glacier2Lib/Makefile @@ -12,7 +12,7 @@ top_srcdir = ../.. LIBFILENAME = $(call mklibfilename,Glacier2,$(VERSION)) SONAME = $(call mksoname,Glacier2,$(SOVERSION)) LIBNAME = $(call mklibname,Glacier2) - +FRAMEWORK = Glacier2 TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME)) diff --git a/cpp/src/Ice/DynamicLibrary.cpp b/cpp/src/Ice/DynamicLibrary.cpp index b573a7f4388..7dd0ea2fcf3 100644 --- a/cpp/src/Ice/DynamicLibrary.cpp +++ b/cpp/src/Ice/DynamicLibrary.cpp @@ -170,8 +170,9 @@ IceInternal::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool useIc #ifdef __APPLE__ // - // On OS X fallback to .so and .bundle extensions if the default - // .dylib fails. + // On OS X fallback to .so and .bundle extensions, we also fallback + // to use the library name without an extesion in case is an OS X + // Framework, if the default .dylib fails. // if(!load(lib + ".dylib")) { @@ -182,7 +183,12 @@ IceInternal::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool useIc if(!load(lib + ".bundle")) { _err = errMsg + "; " + _err; - return 0; + + if(!load(libPath + libName)) + { + _err = errMsg + "; " + _err; + return 0; + } } } _err = ""; diff --git a/cpp/src/Ice/Makefile b/cpp/src/Ice/Makefile index 60aa1f604c9..f9328196f52 100644 --- a/cpp/src/Ice/Makefile +++ b/cpp/src/Ice/Makefile @@ -13,6 +13,7 @@ LIBFILENAME = $(call mklibfilename,Ice,$(VERSION)) SONAME = $(call mksoname,Ice,$(SOVERSION)) LIBNAME = $(call mklibname,Ice) TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME)) +FRAMEWORK = Ice OBJS = Acceptor.o \ Application.o \ diff --git a/cpp/src/IceGridLib/Makefile b/cpp/src/IceGridLib/Makefile index abaf955cc19..f910bbcffcd 100644 --- a/cpp/src/IceGridLib/Makefile +++ b/cpp/src/IceGridLib/Makefile @@ -12,6 +12,7 @@ top_srcdir = ../.. LIBFILENAME = $(call mklibfilename,IceGrid,$(VERSION)) SONAME = $(call mksoname,IceGrid,$(SOVERSION)) LIBNAME = $(call mklibname,IceGrid) +FRAMEWORK = IceGrid LIBTARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME)) TARGETS = $(LIBTARGETS) $(NODE_SERVER) $(REGISTRY_SERVER) $(ADMIN) diff --git a/cpp/src/IcePatch2Lib/Makefile b/cpp/src/IcePatch2Lib/Makefile index c39b03c227b..13e2849638b 100644 --- a/cpp/src/IcePatch2Lib/Makefile +++ b/cpp/src/IcePatch2Lib/Makefile @@ -12,6 +12,7 @@ top_srcdir = ../.. LIBFILENAME = $(call mklibfilename,IcePatch2,$(VERSION)) SONAME = $(call mksoname,IcePatch2,$(SOVERSION)) LIBNAME = $(call mklibname,IcePatch2) +FRAMEWORK = IcePatch2 TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME)) diff --git a/cpp/src/IceSSL/Makefile b/cpp/src/IceSSL/Makefile index bbaaf3557ca..17fcd26cff8 100644 --- a/cpp/src/IceSSL/Makefile +++ b/cpp/src/IceSSL/Makefile @@ -13,6 +13,8 @@ top_srcdir = ../.. LIBFILENAME = $(call mklibfilename,IceSSL,$(VERSION)) SONAME = $(call mksoname,IceSSL,$(SOVERSION)) LIBNAME = $(call mklibname,IceSSL) +FRAMEWORK = IceSSL + TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME)) OBJS = AcceptorI.o \ diff --git a/cpp/src/IceStormLib/Makefile b/cpp/src/IceStormLib/Makefile index aea2a06868a..b8d709e6571 100644 --- a/cpp/src/IceStormLib/Makefile +++ b/cpp/src/IceStormLib/Makefile @@ -12,6 +12,7 @@ top_srcdir = ../.. LIBFILENAME = $(call mklibfilename,IceStorm,$(VERSION)) SONAME = $(call mksoname,IceStorm,$(SOVERSION)) LIBNAME = $(call mklibname,IceStorm) +FRAMEWORK = IceStorm TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME)) diff --git a/cpp/src/IceUtil/Makefile b/cpp/src/IceUtil/Makefile index 9f889f4f69a..8c4086fab42 100644 --- a/cpp/src/IceUtil/Makefile +++ b/cpp/src/IceUtil/Makefile @@ -13,6 +13,8 @@ LIBFILENAME = $(call mklibfilename,IceUtil,$(VERSION)) SONAME = $(call mksoname,IceUtil,$(SOVERSION)) LIBNAME = $(call mklibname,IceUtil) TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME)) +FRAMEWORK = IceUtil + OBJS = ArgVector.o \ Cond.o \ |