Commit 7b3e6464 authored by Csaba Kertész's avatar Csaba Kertész Committed by Jasem Mutlaq

Final fixes for Android

parent d2c6cb39
......@@ -120,7 +120,7 @@ if(BUILD_KSTARS_LITE)
if(ANDROID)
externalproject_add(cfitsio SOURCE_DIR "${CMAKE_BINARY_DIR}/android/3rdparty/cfitsio"
URL https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio3370.tar.gz
PATCH_COMMAND bash -c "cd ${CMAKE_BINARY_DIR}/android/3rdparty/cfitsio && patch -p0 < ${CMAKE_SOURCE_DIR}/android/3rdparty/cfitsio.patch"
PATCH_COMMAND bash -c "cd ${CMAKE_BINARY_DIR}/android/3rdparty/cfitsio && dos2unix ${CMAKE_BINARY_DIR}/android/3rdparty/cfitsio/CMakeLists.txt && patch -p0 < ${CMAKE_SOURCE_DIR}/android/3rdparty/cfitsio.patch"
CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/android/toolchain-android.cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
BUILD_COMMAND make cfitsio
BUILD_IN_SOURCE 1
......
......@@ -7,6 +7,7 @@ Prerequisites:
(https://bugreports.qt.io/browse/QTBUG-54666) what can be fixed by only patching one cmake config file.
The build files will comment the problematic line.
- Get KStars source code from from Github or KDE
- sudo apt-get install dos2unix
Set the following environmental variables before building:
......@@ -42,7 +43,6 @@ cmake -B. -H.. -DBUILD_KSTARS_LITE=ON -DCMAKE_TOOLCHAIN_FILE=android/toolchain-a
- Compile:
make -j4 indi
make -j4
- Install:
......
......@@ -1029,7 +1029,7 @@ endif(NOT BUILD_KSTARS_LITE)
if (ANDROID)
add_library(kstars SHARED ${KSTARS_APP_SRCS})
add_dependencies(KStarsLib cfitsio indi nova raw)
target_link_libraries(kstars KStarsLib ${CMAKE_SOURCE_DIR}/android/hack/locale.o -lgnustl_static)
target_link_libraries(kstars KStarsLib ${CMAKE_SOURCE_DIR}/android/hack/locale.ho -lgnustl_static)
else ()
add_executable(kstars ${KSTARS_APP_SRCS})
target_link_libraries(kstars KStarsLib)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment