diff options
| author | Jose <jose@zeroc.com> | 2014-05-05 17:41:50 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-05-05 17:41:50 +0200 |
| commit | 77474b0edd49496d74a0fc2efb84d2bd592fa245 (patch) | |
| tree | d7cdc575061e0914616a2768c51fe932e1aaf516 /cpp | |
| parent | Fixed (ICE-714) - New visibility options in GCC 4.0 (diff) | |
| download | ice-77474b0edd49496d74a0fc2efb84d2bd592fa245.tar.bz2 ice-77474b0edd49496d74a0fc2efb84d2bd592fa245.tar.xz ice-77474b0edd49496d74a0fc2efb84d2bd592fa245.zip | |
minor build fix
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/Ice/Makefile | 2 | ||||
| -rw-r--r-- | cpp/src/IceUtil/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Ice/Makefile b/cpp/src/Ice/Makefile index 71c5898d193..8e2835b9545 100644 --- a/cpp/src/Ice/Makefile +++ b/cpp/src/Ice/Makefile @@ -176,7 +176,7 @@ CPPFLAGS := $(CPPFLAGS) -DCOMPSUFFIX=\"$(COMPSUFFIX)\" endif SLICE2CPPFLAGS := --ice --include-dir Ice --dll-export ICE_API $(SLICE2CPPFLAGS) -LINKWITH := -lIceUtil $(BZIP2_LIBS) $(ICE_OS_LIBS) +LINKWITH := -lIceUtil $(BZIP2_LIBS) $(ICE_OS_LIBS) $(ICONV_LIBS) ifeq ($(STATICLIBS),yes) $(libdir)/$(LIBNAME): $(OBJS) diff --git a/cpp/src/IceUtil/Makefile b/cpp/src/IceUtil/Makefile index d5814dc8e49..0ff4e4e525b 100644 --- a/cpp/src/IceUtil/Makefile +++ b/cpp/src/IceUtil/Makefile @@ -42,7 +42,7 @@ SRCS = $(OBJS:.o=.cpp) include $(top_srcdir)/config/Make.rules CPPFLAGS := $(CPPFLAGS) $(ICEUTIL_FLAGS) -DICE_UTIL_API_EXPORTS -I.. -LINKWITH := $(ICEUTIL_OS_LIBS) $(ICONV_LIBS) +LINKWITH := $(ICEUTIL_OS_LIBS) ifeq ($(STATICLIBS),yes) $(libdir)/$(LIBNAME): $(OBJS) |