Martchus
/
passwordmanager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adapt Android specific code to c++utilities v5

This commit is contained in:
Martchus 2019-07-03 00:38:29 +02:00
parent 27f90b7008
commit dd77f56a40
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
README.md
View File

@ -149,15 +149,10 @@ cmake \
-DCMAKE_PREFIX_PATH="$root" \
-DCMAKE_FIND_ROOT_PATH="$root;$root/libs" \
-DCMAKE_CXX_FLAGS="-I/opt/android-ndk/sources/cxx-stl/llvm-libc++/include" \
-Diconv_DYNAMIC_INCLUDE_DIR="$other_libs_include" \
-Diconv_STATIC_INCLUDE_DIR="$other_libs_include" \
-Dcrypto_DYNAMIC_INCLUDE_DIR="$other_libs_include" \
-Dcrypto_STATIC_INCLUDE_DIR="$other_libs_include" \
-Dboost_iostreams_DYNAMIC_INCLUDE_DIR="$other_libs_include" \
-Dboost_iostreams_STATIC_INCLUDE_DIR="$other_libs_include" \
-DZLIB_LIBRARY="$android_ndk_root/platforms/android-$_android_api_level/arch-$_android_arch2/usr/lib/libz.so" \
-DCLANG_FORMAT_ENABLED=ON \
-DUSE_NATIVE_FILE_BUFFER=ON \
-DUSE_STANDARD_FILESYSTEM=OFF \
-DNO_DOXYGEN=ON \
-DWIDGETS_GUI=OFF \
-DQUICK_GUI=ON \
@ -185,14 +180,9 @@ cmake \
-DCMAKE_PREFIX_PATH="$root" \
-DCMAKE_FIND_ROOT_PATH="$root;$root/libs" \
-DCMAKE_CXX_FLAGS="-D__ANDROID_API__=$_android_api_level" \
-Diconv_DYNAMIC_INCLUDE_DIR="$other_libs_include" \
-Diconv_STATIC_INCLUDE_DIR="$other_libs_include" \
-Dcrypto_DYNAMIC_INCLUDE_DIR="$other_libs_include" \
-Dcrypto_STATIC_INCLUDE_DIR="$other_libs_include" \
-Dboost_iostreams_DYNAMIC_INCLUDE_DIR="$other_libs_include" \
-Dboost_iostreams_STATIC_INCLUDE_DIR="$other_libs_include" \
-DCLANG_FORMAT_ENABLED=ON \
-DUSE_NATIVE_FILE_BUFFER=ON \
-DUSE_STANDARD_FILESYSTEM=OFF \
-DNO_DOXYGEN=ON \
-DWIDGETS_GUI=OFF \
-DQUICK_GUI=ON \

2
quickgui/android.cpp
View File

@ -16,7 +16,7 @@
#include <jni.h>
using namespace ConversionUtilities;
using namespace CppUtilities;
namespace QtGui {