diff options
| author | Creeper-xie <69880521+Creeper-xie@users.noreply.github.com> | 2023-11-28 16:14:40 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-28 09:14:40 +0100 |
| commit | 3f2d4a5274076ba63fe8f8fd30db0d305d7dc569 (patch) | |
| tree | 31af464b961dd950aac7f88956a6128ac2f09ace | |
| parent | ae83035380b6f3335873fd92d18fb1099dff6365 (diff) | |
| download | box64-3f2d4a5274076ba63fe8f8fd30db0d305d7dc569.tar.gz box64-3f2d4a5274076ba63fe8f8fd30db0d305d7dc569.zip | |
[ANDROID]Fix Termux installation path (#1095)
| -rw-r--r-- | CMakeLists.txt | 50 |
1 files changed, 37 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7e932cbf..0753fd14 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,9 @@ cmake_policy(SET CMP0065 NEW) SET(CMAKE_C_FLAGS_DEBUG "-O0 -g") SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g") - +if(TERMUX) + set(TERMUX_PATH "/data/data/com.termux/files") +endif() option(RPI3ARM64 "Set to ON if targeting an RaspberryPI3 device with multiarch arm64 and armhf" ${RPI3ARM64}) option(RPI4ARM64 "Set to ON if targeting an RaspberryPI4 device with multiarch arm64 and armhf" ${RPI4ARM64}) option(RK3326 "Set to ON if targeting an Rockchip RK3326 based device" ${RK3326}) @@ -806,7 +808,7 @@ else() target_link_libraries(${BOX64} c m dl) endif() else() - set_target_properties(${BOX64} PROPERTIES LINK_FLAGS "-Wl,--no-as-needed -lc -lm -ldl -lrt -lpthread -lresolv -Wl,--as-needed -pthread") + set_target_properties(${BOX64} PROPERTIES LINK_FLAGS "-Wl,--no-as-needed -lc -lm -ldl -lrt -lpthread -lresolv -Wl,--as-needed -pthread") endif() endif() if(DYNAREC) @@ -847,17 +849,33 @@ if(NOT _x86 AND NOT _x86_64) RUNTIME DESTINATION bin) if(NOT NO_CONF_INSTALL) configure_file(system/box64.conf.cmake system/box64.conf) - install(FILES ${CMAKE_BINARY_DIR}/system/box64.conf DESTINATION /etc/binfmt.d/) - install(FILES ${CMAKE_SOURCE_DIR}/system/box64.box64rc DESTINATION /etc/) + if(NOT TERMUX) + install(FILES ${CMAKE_BINARY_DIR}/system/box64.conf DESTINATION /etc/binfmt.d/) + install(FILES ${CMAKE_SOURCE_DIR}/system/box64.box64rc DESTINATION /etc/) + else() + install(FILES ${CMAKE_BINARY_DIR}/system/box64.conf DESTINATION ${TERMUX_PATH}/usr/etc/binfmt.d/) + install(FILES ${CMAKE_SOURCE_DIR}/system/box64.box64rc DESTINATION ${TERMUX_PATH}/usr/etc/) + endif() + endif() if(NOT NO_LIB_INSTALL) - install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libstdc++.so.5 DESTINATION /usr/lib/x86_64-linux-gnu/) - install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libstdc++.so.6 DESTINATION /usr/lib/x86_64-linux-gnu/) - install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libgcc_s.so.1 DESTINATION /usr/lib/x86_64-linux-gnu/) - install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libpng12.so.0 DESTINATION /usr/lib/x86_64-linux-gnu/) - install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libcrypto.so.1.1 DESTINATION /usr/lib/x86_64-linux-gnu/) - install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libssl.so.1.1 DESTINATION /usr/lib/x86_64-linux-gnu/) - install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libunwind.so.8 DESTINATION /usr/lib/x86_64-linux-gnu/) + if(NOT TERMUX) + install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libstdc++.so.5 DESTINATION /usr/lib/x86_64-linux-gnu/) + install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libstdc++.so.6 DESTINATION /usr/lib/x86_64-linux-gnu/) + install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libgcc_s.so.1 DESTINATION /usr/lib/x86_64-linux-gnu/) + install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libpng12.so.0 DESTINATION /usr/lib/x86_64-linux-gnu/) + install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libcrypto.so.1.1 DESTINATION /usr/lib/x86_64-linux-gnu/) + install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libssl.so.1.1 DESTINATION /usr/lib/x86_64-linux-gnu/) + install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libunwind.so.8 DESTINATION /usr/lib/x86_64-linux-gnu/) + else() + install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libstdc++.so.5 DESTINATION ${TERMUX_PATH}/usr/lib/x86_64-linux-gnu/) + install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libstdc++.so.6 DESTINATION ${TERMUX_PATH}/usr/lib/x86_64-linux-gnu/) + install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libgcc_s.so.1 DESTINATION ${TERMUX_PATH}/usr/lib/x86_64-linux-gnu/) + install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libpng12.so.0 DESTINATION ${TERMUX_PATH}/usr/lib/x86_64-linux-gnu/) + install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libcrypto.so.1.1 DESTINATION ${TERMUX_PATH}/usr/lib/x86_64-linux-gnu/) + install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libssl.so.1.1 DESTINATION ${TERMUX_PATH}/usr/lib/x86_64-linux-gnu/) + install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libunwind.so.8 DESTINATION ${TERMUX_PATH}/usr/lib/x86_64-linux-gnu/) + endif() endif() endif() @@ -875,7 +893,9 @@ set(CPACK_GENERATOR "DEB") set(CPACK_DEBIAN_PACKAGE_MAINTAINER "ptitSeb") set(CPACK_PACKAGE_CONTACT "ptitSeb@box86.org") set(CPACK_PACKAGE_DESCRIPTION "Box64 - Linux Userspace x86_64 Emulator with a twist") -set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6") +if(NOT TERMUX) + set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6") +endif() set(CPACK_PACKAGE_HOMEPAGE_URL, "https://box86.org") file(STRINGS "${BOX64_ROOT}/src/box64version.h" TEMP_STRING REGEX "BOX64_MAJOR\\s*") string(REGEX REPLACE "BOX64_MAJOR" "" TEMP_STRING ${TEMP_STRING}) @@ -891,7 +911,11 @@ set(CPACK_PACKAGE_VERSION_MINOR ${BOX64_MINOR}) set(CPACK_PACKAGE_VERSION_PATCH ${BOX64_REVISION}) set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/postinst") if(_aarch64) - set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "arm64") + if(TERMUX) + set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "aarch64") + else() + set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "arm64") + endif() elseif(__riscv64) set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "riscv64") elseif(_x86_64) |