Skip to content

Commit

Permalink
Remove ICU_LIBRARIES from linking
Browse files Browse the repository at this point in the history
- 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
  • Loading branch information
who-biz committed Jul 30, 2020
1 parent a45f2d0 commit 019aa08
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 39 deletions.
5 changes: 0 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -833,11 +833,6 @@ include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
if(MINGW)
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wa,-mbig-obj")
set(EXTRA_LIBRARIES mswsock;ws2_32;iphlpapi;crypt32;bcrypt)
if(DEPENDS)
set(ICU_LIBRARIES icuio icui18n icuuc icudata icutu iconv)
else()
set(ICU_LIBRARIES icuio icuin icuuc icudt icutu iconv)
endif()
elseif(APPLE OR OPENBSD OR ANDROID)
set(EXTRA_LIBRARIES "")
elseif(FREEBSD)
Expand Down
32 changes: 0 additions & 32 deletions contrib/depends/packages/icu4c.mk

This file was deleted.

1 change: 0 additions & 1 deletion contrib/depends/packages/packages.mk
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ packages += unwind
packages += sodium
endif
ifeq ($(host_os),mingw32)
packages += icu4c
packages += sodium
endif

Expand Down
1 change: 0 additions & 1 deletion src/simplewallet/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ target_link_libraries(simplewallet
${Boost_PROGRAM_OPTIONS_LIBRARY}
${Boost_FILESYSTEM_LIBRARY}
${Boost_LOCALE_LIBRARY}
${ICU_LIBRARIES}
${Boost_THREAD_LIBRARY}
${CMAKE_THREAD_LIBS_INIT}
${GNU_READLINE_LIBRARY}
Expand Down

0 comments on commit 019aa08

Please sign in to comment.