diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/config/Make.rules | 12 | ||||
| -rw-r--r-- | cpp/config/Make.rules.Darwin | 18 |
2 files changed, 28 insertions, 2 deletions
diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules index 482e998ad6b..baf7d70fdcd 100644 --- a/cpp/config/Make.rules +++ b/cpp/config/Make.rules @@ -120,12 +120,20 @@ USE_READLINE ?= no #GENPIC ?= yes # -# If building with MinGW and third party libraries are not installed +# If building with MinGW and third party libraries are not installed # in the default location and THIRDPARTY_HOME is not set in your # environment variables, change the following setting to reflect the # installation location. # -THIRDPARTY_HOME ?= C:\Program Files (x86)\ZeroC\Ice-$(VERSION)-ThirdParty +#THIRDPARTY_HOME ?= C:\Program Files (x86)\ZeroC\Ice-$(VERSION)-ThirdParty + +# +# If building on OS X and third party libraries are not installed +# in the default location and THIRDPARTY_HOME is not set in your +# environment variables, change the following setting to reflect the +# installation location. +# +#THIRDPARTY_HOME ?= /Library/Developer/Ice-$(VERSION)-ThirdParty # # Default Mutex protocol: one of PrioNone or PrioInherit. diff --git a/cpp/config/Make.rules.Darwin b/cpp/config/Make.rules.Darwin index 2bb8d945696..2adbcaadd41 100644 --- a/cpp/config/Make.rules.Darwin +++ b/cpp/config/Make.rules.Darwin @@ -85,3 +85,21 @@ ICE_OS_LIBS = -ldl SSL_OS_LIBS = -framework Security -framework CoreFoundation PLATFORM_HAS_READLINE := yes + +ifeq ($(THIRDPARTY_HOME),) +THIRDPARTY_HOME = /Library/Developer/Ice-$(VERSION)-ThirdParty +endif + +ifeq ($(DB_HOME),) + ifneq ($(wildcard $(THIRDPARTY_HOME)/$(libsubdir)$(cpp11suffix)/libdb_cxx.dylib),) + DB_HOME = $(THIRDPARTY_HOME) + endif +endif + +ifeq ($(MCPP_HOME),) + ifneq ($(wildcard $(THIRDPARTY_HOME)/$(libsubdir)/libmcpp.a),) + MCPP_HOME = $(THIRDPARTY_HOME) + endif +endif + + |