diff options
| author | TheCharlatan <seb.kung@gmail.com> | 2018-09-17 23:59:37 +0200 |
|---|---|---|
| committer | TheCharlatan <seb.kung@gmail.com> | 2018-09-17 23:59:37 +0200 |
| commit | a06d2581c3938006df9776185521db5216712629 (patch) | |
| tree | e8ccc93dbc8343b88ad007e8136984d9693c8097 | |
| parent | Add libsodium to the packages, the arm build was complaining about it. (diff) | |
| download | monero-a06d2581c3938006df9776185521db5216712629.tar.xz | |
Fix Windows build
icu tex support is not required, so just disable it.
Re-add mistakingly removed crypt32 lib.
Diffstat (limited to '')
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | contrib/depends/packages/icu4c.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6d4fe96e5..0de82b436 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -829,7 +829,7 @@ endif() 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) + set(EXTRA_LIBRARIES mswsock;ws2_32;iphlpapi;crypt32) if(DEPENDS) set(ICU_LIBRARIES ${Boost_LOCALE_LIBRARY} sicuio sicuin sicuuc sicudt sicutu iconv) else() diff --git a/contrib/depends/packages/icu4c.mk b/contrib/depends/packages/icu4c.mk index eedf22da0..7e092425e 100644 --- a/contrib/depends/packages/icu4c.mk +++ b/contrib/depends/packages/icu4c.mk @@ -17,7 +17,7 @@ define $(package)_config_cmds sh ../source/runConfigureICU Linux &&\ make &&\ cd ../buildb &&\ - sh ../source/$($(package)_autoconf) --enable-static=yes --enable-shared=yes --prefix=$(host_prefix) --with-cross-build=`pwd`/../builda &&\ + sh ../source/$($(package)_autoconf) --enable-static=yes --enable-shared=yes --disable-layoutex --prefix=$(host_prefix) --with-cross-build=`pwd`/../builda &&\ $(MAKE) $($(package)_build_opts) endef |