disable iconv on android (#13001)
Signed-off-by: 21pages <sunboeasy@gmail.com>
This commit is contained in:
@@ -177,6 +177,7 @@ elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Android")
|
|||||||
string(APPEND OPTIONS "\
|
string(APPEND OPTIONS "\
|
||||||
--target-os=android \
|
--target-os=android \
|
||||||
--disable-asm \
|
--disable-asm \
|
||||||
|
--disable-iconv \
|
||||||
--enable-jni \
|
--enable-jni \
|
||||||
--enable-mediacodec \
|
--enable-mediacodec \
|
||||||
--disable-hwaccels \
|
--disable-hwaccels \
|
||||||
@@ -185,11 +186,6 @@ elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Android")
|
|||||||
--enable-decoder=h264_mediacodec \
|
--enable-decoder=h264_mediacodec \
|
||||||
--enable-decoder=hevc_mediacodec \
|
--enable-decoder=hevc_mediacodec \
|
||||||
")
|
")
|
||||||
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
|
|
||||||
string(APPEND OPTIONS "\
|
|
||||||
--disable-iconv \
|
|
||||||
")
|
|
||||||
endif()
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(VCPKG_TARGET_IS_OSX)
|
if(VCPKG_TARGET_IS_OSX)
|
||||||
|
|||||||
Reference in New Issue
Block a user