diff options
Diffstat (limited to 'cmake/scripts/android/Install.cmake')
| -rw-r--r-- | cmake/scripts/android/Install.cmake | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/cmake/scripts/android/Install.cmake b/cmake/scripts/android/Install.cmake index a121295..5b7b411 100644 --- a/cmake/scripts/android/Install.cmake +++ b/cmake/scripts/android/Install.cmake | |||
| @@ -107,7 +107,7 @@ add_custom_target(bundle | |||
| 107 | ${CMAKE_BINARY_DIR}/tools/android/packaging/media | 107 | ${CMAKE_BINARY_DIR}/tools/android/packaging/media |
| 108 | COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/tools/android/packaging/xbmc/res | 108 | COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/tools/android/packaging/xbmc/res |
| 109 | ${CMAKE_BINARY_DIR}/tools/android/packaging/xbmc/res | 109 | ${CMAKE_BINARY_DIR}/tools/android/packaging/xbmc/res |
| 110 | COMMAND ${CMAKE_COMMAND} -E copy_directory ${DEPENDS_PATH}/lib/python2.7 ${libdir}/python2.7 | 110 | COMMAND ${CMAKE_COMMAND} -E copy_directory ${DEPENDS_PATH}/lib/python${PYTHON_VERSION} ${libdir}/python${PYTHON_VERSION} |
| 111 | COMMAND ${CMAKE_COMMAND} -E copy_directory ${DEPENDS_PATH}/share/${APP_NAME_LC} ${datadir}/${APP_NAME_LC} | 111 | COMMAND ${CMAKE_COMMAND} -E copy_directory ${DEPENDS_PATH}/share/${APP_NAME_LC} ${datadir}/${APP_NAME_LC} |
| 112 | COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${APP_NAME_LC}> | 112 | COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${APP_NAME_LC}> |
| 113 | ${libdir}/${APP_NAME_LC}/$<TARGET_FILE_NAME:${APP_NAME_LC}>) | 113 | ${libdir}/${APP_NAME_LC}/$<TARGET_FILE_NAME:${APP_NAME_LC}>) |
| @@ -153,13 +153,12 @@ foreach(lib IN LISTS required_dyload dyload_optional ITEMS Shairplay) | |||
| 153 | endif() | 153 | endif() |
| 154 | endforeach() | 154 | endforeach() |
| 155 | add_bundle_file(${ASS_LIBRARY} ${libdir} "") | 155 | add_bundle_file(${ASS_LIBRARY} ${libdir} "") |
| 156 | add_bundle_file(${BLURAY_LIBRARY} ${libdir} "") | 156 | add_bundle_file(${SHAIRPLAY_LIBRARY} ${libdir} "") |
| 157 | add_bundle_file(${SMBCLIENT_LIBRARY} ${libdir} "") | 157 | add_bundle_file(${SMBCLIENT_LIBRARY} ${libdir} "") |
| 158 | 158 | ||
| 159 | # Main targets from Makefile.in | 159 | # Main targets from Makefile.in |
| 160 | if(CPU MATCHES i686) | 160 | if(CPU MATCHES i686) |
| 161 | set(CPU x86) | 161 | set(CPU x86) |
| 162 | set(ARCH x86) | ||
| 163 | endif() | 162 | endif() |
| 164 | foreach(target apk obb apk-unsigned apk-obb apk-obb-unsigned apk-noobb apk-clean apk-sign) | 163 | foreach(target apk obb apk-unsigned apk-obb apk-obb-unsigned apk-noobb apk-clean apk-sign) |
| 165 | add_custom_target(${target} | 164 | add_custom_target(${target} |
| @@ -168,7 +167,6 @@ foreach(target apk obb apk-unsigned apk-obb apk-obb-unsigned apk-noobb apk-clean | |||
| 168 | CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR} | 167 | CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR} |
| 169 | CC=${CMAKE_C_COMPILER} | 168 | CC=${CMAKE_C_COMPILER} |
| 170 | CPU=${CPU} | 169 | CPU=${CPU} |
| 171 | ARCH=${ARCH} | ||
| 172 | HOST=${HOST} | 170 | HOST=${HOST} |
| 173 | TOOLCHAIN=${TOOLCHAIN} | 171 | TOOLCHAIN=${TOOLCHAIN} |
| 174 | PREFIX=${prefix} | 172 | PREFIX=${prefix} |
