diff options
Diffstat (limited to 'cpp/src/Ice/Makefile.mk')
| -rw-r--r-- | cpp/src/Ice/Makefile.mk | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/cpp/src/Ice/Makefile.mk b/cpp/src/Ice/Makefile.mk index cc3dbc55b5e..50ace93ca83 100644 --- a/cpp/src/Ice/Makefile.mk +++ b/cpp/src/Ice/Makefile.mk @@ -10,11 +10,20 @@ $(project)_libraries = Ice Ice_targetdir := $(libdir) -Ice_dependencies := IceUtil -Ice_cppflags := -DICE_API_EXPORTS +Ice_cppflags = -DICE_API_EXPORTS -DICE_UTIL_API_EXPORTS + +ifeq ($(DEFAULT_MUTEX_PROTOCOL), PrioInherit) + Ice_cppflags += -DICE_PRIO_INHERIT +endif + +ifeq ($(libbacktrace),yes) + Ice_cppflags += -DICE_LIBBACKTRACE +endif + Ice_sliceflags := --include-dir Ice --dll-export ICE_API Ice_libs := bz2 -Ice_system_libs := $(ICE_OS_LIBS) +Ice_system_libs := $(ICE_OS_LIBS) $(ICEUTIL_OS_LIBS) +Ice_extra_sources := $(wildcard src/IceUtil/*.cpp) Ice_excludes := $(currentdir)/DLLMain.cpp projects += $(project) |