Fix Windows build
icu tex support is not required, so just disable it. Re-add mistakingly removed crypt32 lib.
This commit is contained in:
parent
ecaf5b3feb
commit
a06d2581c3
|
@ -829,7 +829,7 @@ endif()
|
||||||
include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
|
include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
|
||||||
if(MINGW)
|
if(MINGW)
|
||||||
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wa,-mbig-obj")
|
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)
|
if(DEPENDS)
|
||||||
set(ICU_LIBRARIES ${Boost_LOCALE_LIBRARY} sicuio sicuin sicuuc sicudt sicutu iconv)
|
set(ICU_LIBRARIES ${Boost_LOCALE_LIBRARY} sicuio sicuin sicuuc sicudt sicutu iconv)
|
||||||
else()
|
else()
|
||||||
|
|
|
@ -17,7 +17,7 @@ define $(package)_config_cmds
|
||||||
sh ../source/runConfigureICU Linux &&\
|
sh ../source/runConfigureICU Linux &&\
|
||||||
make &&\
|
make &&\
|
||||||
cd ../buildb &&\
|
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)
|
$(MAKE) $($(package)_build_opts)
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue