Fix linking with cmake and included iconv

Previously, the GNU linker would complain about missing libcharset_relocate.
The MSVC linker did not complain, since the code that uses libcharset_relocate
does not seem to be sued, so it removed it.

diff --git a/3rdparty/libiconv/CMakeLists.txt b/3rdparty/libiconv/CMakeLists.txt
index e1c6e2cd1ba9db5b439d39dba65a2f959dd595da..210d0c2e652a089e2caa5ff73e8a04162122f949 100644 (file)
--- a/3rdparty/libiconv/CMakeLists.txt
+++ b/3rdparty/libiconv/CMakeLists.txt
@@ -45,7 +45,7 @@ add_definitions(-Dset_relocation_prefix=libcharset_set_relocation_prefix -Dreloc
 set(SRC_LIBCHARSET ${SRCDIR}/libcharset/lib/localcharset.c)
 
 # libiconv
-set(SRC_LIBICONV ${SRCDIR}/lib/iconv.c)
+set(SRC_LIBICONV ${SRCDIR}/lib/iconv.c ${SRCDIR}/lib/relocatable.c)
 
 add_library(iconv ${SRC_LIBICONV} ${SRC_LIBCHARSET})
 set_target_properties(iconv PROPERTIES COMPILE_FLAGS -DBUILDING_LIBICONV)