SHS/libs
Archived
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

android support

Browse Source 
git-svn-id: svn://db.shs.com.ru/libs@257 a8b55f48-bf90-11e4-a774-851b48703e85
This commit is contained in:
Пелипенко Иван
2017-08-07 09:44:15 +00:00
parent f144f6ea7f
commit f435f16667
4 changed files with 36 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@@ -6,6 +6,12 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}
if(MINGW) if(MINGW)
find_package(MinGW REQUIRED) find_package(MinGW REQUIRED)
endif() endif()
if (DEFINED ANDROID_PLATFORM)
include_directories(${ANDROID_SYSTEM_LIBRARY_PATH}/usr/include)
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${ANDROID_NDK}/sysroot/usr/include")
#message("${ANDROID_SYSTEM_LIBRARY_PATH}/usr/include")
#message("${ANDROID_NDK}/sysroot/usr/include")
endif()
option(LIB "System install" 1) option(LIB "System install" 1)
option(DEBUG "Build with -g3" 0) option(DEBUG "Build with -g3" 0)
option(QGLVIEW "Build QGLview library and utils" 0) option(QGLVIEW "Build QGLview library and utils" 0)
@@ -41,7 +47,11 @@ foreach(F ${PIP_FOLDERS})
list(APPEND PIP_INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/pip/src_main/${F}") list(APPEND PIP_INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/pip/src_main/${F}")
endforeach(F) endforeach(F)
#message(${PIP_INCLUDES}) #message(${PIP_INCLUDES})
if(DEFINED ANDROID_PLATFORM)
set(PIP_CMG "pip_cmg")
else()
set(PIP_CMG "${CMAKE_CURRENT_BINARY_DIR}/pip/utils/code_model_generator/pip_cmg") set(PIP_CMG "${CMAKE_CURRENT_BINARY_DIR}/pip/utils/code_model_generator/pip_cmg")
endif()
if(WIN32) if(WIN32)
set(PIP_DLL_DIR "${CMAKE_CURRENT_BINARY_DIR}/pip") set(PIP_DLL_DIR "${CMAKE_CURRENT_BINARY_DIR}/pip")
endif() endif()

11
make_android.sh Executable file
View File

@@ -0,0 +1,11 @@
export Qt5_ROOT=/mnt/data/Qt_5.9.1_linux/5.9.1/android_armv7/lib/cmake
export Qt5_DIR=${Qt5_ROOT}/Qt5
export Qt5LinguistTools_DIR=${Qt5_ROOT}/Qt5LinguistTools
export Qt5UiPlugin_DIR=${Qt5_ROOT}/Qt5UiPlugin
export Qt5Widgets_DIR=${Qt5_ROOT}/Qt5Widgets
export Qt5Core_DIR=${Qt5_ROOT}/Qt5Core
export Qt5Gui_DIR=${Qt5_ROOT}/Qt5Gui
export Qt5Sql_DIR=${Qt5_ROOT}/Qt5Sql
export Qt5OpenGL_DIR=${Qt5_ROOT}/Qt5OpenGL
export Qt5Designer_DIR=${Qt5_ROOT}/Qt5Designer
rm -rf * && cmake -Wno-dev -DCMAKE_TOOLCHAIN_FILE=/mnt/data/Distrib/Android/android-sdk-linux/ndk-bundle/build/cmake/android.toolchain.cmake -DANDROID_PLATFORM=android-24 -DICU=0 -DQt4=0 -DQt5=1 -DQt5_DIR=${Qt5_ROOT}/Qt5 -DQt5LinguistTools_DIR=${Qt5_ROOT}/Qt5LinguistTools -DQt5UiPlugin_DIR=${Qt5_ROOT}/Qt5UiPlugin -DQt5Widgets_DIR=${Qt5_ROOT}/Qt5Widgets -DQt5Core_DIR=${Qt5_ROOT}/Qt5Core -DQt5Gui_DIR=${Qt5_ROOT}/Qt5Gui -DQt5Sql_DIR=${Qt5_ROOT}/Qt5Sql -DQt5OpenGL_DIR=${Qt5_ROOT}/Qt5OpenGL ../libs

4
qad/CMakeLists.txt
View File

@@ -13,7 +13,9 @@ else()
endif () endif ()
endif() endif()
if (NOT DEFINED ANDROID_PLATFORM)
find_package(OpenGL REQUIRED) find_package(OpenGL REQUIRED)
endif()
if (MINGW) if (MINGW)
find_package(MinGW REQUIRED) find_package(MinGW REQUIRED)
endif() endif()
@@ -87,10 +89,12 @@ macro(qad_project NAME _MODULES _LIBS)
qt_target_link_libraries(${PROJ_NAME} ${_LIBS}) qt_target_link_libraries(${PROJ_NAME} ${_LIBS})
qad_install(${PROJ_NAME} "${out_HDR}") qad_install(${PROJ_NAME} "${out_HDR}")
message(STATUS "Building ${PROJ_NAME}") message(STATUS "Building ${PROJ_NAME}")
if (NOT DEFINED ANDROID_PLATFORM)
if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/plugin") if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/plugin")
set(_${NAME}_PLUGIN_LIBS "${_LIBS}") set(_${NAME}_PLUGIN_LIBS "${_LIBS}")
add_subdirectory(plugin) add_subdirectory(plugin)
endif() endif()
endif()
endmacro() endmacro()
set(DIRS utils widgets application blockview graphic sql_table touch_widgets) set(DIRS utils widgets application blockview graphic sql_table touch_widgets)

6
qad/graphic/graphic.cpp
View File

@@ -227,7 +227,11 @@ void Graphic::canvasPaintEvent(QPaintEvent * ) {
//phei = hei; //phei = hei;
QPainter p; QPainter p;
if (isOGL) { if (isOGL) {
#ifdef ANDROID
p.fillRect(canvas->rect(), Qt::black);
#else
glClearColor(0.f, 0.f, 0.f, 0.f); glClearColor(0.f, 0.f, 0.f, 0.f);
#endif
p.begin(canvas); p.begin(canvas);
} else p.begin(buffer); } else p.begin(buffer);
p.fillRect(canvas->rect(), back_color); p.fillRect(canvas->rect(), back_color);
@@ -242,8 +246,10 @@ void Graphic::canvasPaintEvent(QPaintEvent * ) {
} }
p.setRenderHint(QPainter::Antialiasing, aalias); p.setRenderHint(QPainter::Antialiasing, aalias);
if (isOGL) { if (isOGL) {
#ifndef ANDROID
if (aalias) glEnable(GL_MULTISAMPLE); if (aalias) glEnable(GL_MULTISAMPLE);
else glDisable(GL_MULTISAMPLE); else glDisable(GL_MULTISAMPLE);
#endif
} }
//p.setRenderHint(QPainter::HighQualityAntialiasing, aalias); //p.setRenderHint(QPainter::HighQualityAntialiasing, aalias);
if (!aalias) p.translate(-0.5, -0.5); if (!aalias) p.translate(-0.5, -0.5);