mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-12-24 13:53:08 +00:00
Code Issues Releases Wiki Activity

Only disable building ICU tools when doing an android cross-compile

Browse source 
Otherwise the icudata library won't be built
This commit is contained in:
Benjamin Winger 2022-04-20 18:59:31 -04:00
parent 206f0d4b1d
commit 8a09cec0ab
No known key found for this signature in database
GPG key ID: 22E22BE7466677FC
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
extern/CMakeLists.txt vendored
View file

@ -268,7 +268,7 @@ if (NOT OPENMW_USE_SYSTEM_ICU)
"CPPFLAGS=${ANDROID_COMPILER_FLAGS}" "CPPFLAGS=${ANDROID_COMPILER_FLAGS}"
"LDFLAGS=${ANDROID_LINKER_FLAGS} -lc -lstdc++" "LDFLAGS=${ANDROID_LINKER_FLAGS} -lc -lstdc++"
) )
set(ICU_ADDITIONAL_OPTS --host=${ICU_TOOLCHAIN_NAME}${ANDROIDVER} --with-cross-build=${OPENMW_ICU_HOST_BUILD_DIR}) set(ICU_ADDITIONAL_OPTS --disable-tools --host=${ICU_TOOLCHAIN_NAME}${ANDROIDVER} --with-cross-build=${OPENMW_ICU_HOST_BUILD_DIR})
endif() endif()
include(ExternalProject) include(ExternalProject)
ExternalProject_Add(icu ExternalProject_Add(icu
@ -277,7 +277,7 @@ if (NOT OPENMW_USE_SYSTEM_ICU)
SOURCE_DIR fetched/icu SOURCE_DIR fetched/icu
CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env ${ICU_ENV} CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env ${ICU_ENV}
<SOURCE_DIR>/icu4c/source/configure --enable-static --disable-shared <SOURCE_DIR>/icu4c/source/configure --enable-static --disable-shared
--disable-tests --disable-samples --disable-icuio --disable-extras --disable-tools ${ICU_ADDITIONAL_OPTS} --disable-tests --disable-samples --disable-icuio --disable-extras ${ICU_ADDITIONAL_OPTS}
BUILD_COMMAND make BUILD_COMMAND make
INSTALL_COMMAND "" INSTALL_COMMAND ""
) )