Skip to content

Commit 019aa08

Browse files
committed
Remove ICU_LIBRARIES from linking
- Comments from Monero seem to indicate that these are necessary, otherwise linking errors will result - Doesn't appear to be true, and compilation seems fine without them. - We already weren't linking them in libwallet, and simplewallet runs fine - Looks like on Windows there are some issues displaying non-english Locales, but relatively small problem compared to potential issues arising from use of unicode
1 parent a45f2d0 commit 019aa08

File tree

4 files changed

+0
-39
lines changed

4 files changed

+0
-39
lines changed

CMakeLists.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -833,11 +833,6 @@ include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
833833
if(MINGW)
834834
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wa,-mbig-obj")
835835
set(EXTRA_LIBRARIES mswsock;ws2_32;iphlpapi;crypt32;bcrypt)
836-
if(DEPENDS)
837-
set(ICU_LIBRARIES icuio icui18n icuuc icudata icutu iconv)
838-
else()
839-
set(ICU_LIBRARIES icuio icuin icuuc icudt icutu iconv)
840-
endif()
841836
elseif(APPLE OR OPENBSD OR ANDROID)
842837
set(EXTRA_LIBRARIES "")
843838
elseif(FREEBSD)

contrib/depends/packages/icu4c.mk

Lines changed: 0 additions & 32 deletions
This file was deleted.

contrib/depends/packages/packages.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ packages += unwind
1111
packages += sodium
1212
endif
1313
ifeq ($(host_os),mingw32)
14-
packages += icu4c
1514
packages += sodium
1615
endif
1716

src/simplewallet/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ target_link_libraries(simplewallet
5454
${Boost_PROGRAM_OPTIONS_LIBRARY}
5555
${Boost_FILESYSTEM_LIBRARY}
5656
${Boost_LOCALE_LIBRARY}
57-
${ICU_LIBRARIES}
5857
${Boost_THREAD_LIBRARY}
5958
${CMAKE_THREAD_LIBS_INIT}
6059
${GNU_READLINE_LIBRARY}

0 commit comments

Comments
 (0)