Default to termux directories on android

This commit is contained in:
Linus Dierheimer
2022-04-10 15:26:18 +02:00
parent bd0c593871
commit f58d0df336
2 changed files with 20 additions and 3 deletions
+17 -3
View File
@@ -39,13 +39,27 @@ set(CMAKE_EXE_LINKER_FLAGS_RELEASE "-Wl,-O3")
# These variables are mainly here for android, which has a different root fs structure.
if(NOT TARGET_DIR_ROOT)
set(TARGET_DIR_ROOT "")
if(NOT ANDROID)
set(TARGET_DIR_ROOT "")
else()
set(TARGET_DIR_ROOT "/data/data/com.termux/files/usr")
endif()
endif()
if(NOT TARGET_DIR_USR)
set(TARGET_DIR_USR "${TARGET_DIR_ROOT}/usr")
if(NOT ANDROID)
set(TARGET_DIR_USR "${TARGET_DIR_ROOT}/usr")
else()
set(TARGET_DIR_USR "${TARGET_DIR_ROOT}")
endif()
endif()
if(NOT TARGET_DIR_HOME)
set(TARGET_DIR_HOME "${TARGET_DIR_ROOT}/home")
if(NOT ANDROID)
set(TARGET_DIR_HOME "${TARGET_DIR_ROOT}/home")
else()
set(TARGET_DIR_HOME "/data/data/com.termux/files/home")
endif()
endif()
function(fastfetch_load_text FILENAME OUTVAR)
+3
View File
@@ -110,7 +110,10 @@ bool ffLogoPrintSixelIfExists(FFinstance* instance)
{
#ifdef FF_HAVE_IMAGEMAGICK
return printSixel(instance);
#else
FF_UNUSED(instance);
#endif
return false;
}