From 3dea82833bd73b1b26080f1ff0c592a612bc2ef7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Thu, 4 Apr 2019 08:05:18 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@517 a8b55f48-bf90-11e4-a774-851b48703e85 --- make_android.bat | 59 ++++++++++++++++++++++++++++++++++------------ make_android64.bat | 16 ------------- 2 files changed, 44 insertions(+), 31 deletions(-) delete mode 100644 make_android64.bat diff --git a/make_android.bat b/make_android.bat index 8c909ea..c4e10c4 100644 --- a/make_android.bat +++ b/make_android.bat @@ -1,16 +1,45 @@ -:please add to environment ANDROID_QT5_DIR (path to Qt directory) and ANDROID_NDK_HOME (path to android ndk directory) -:execute with Android API version e. g. : #make_android.bat 24 - -set Qt5_ROOT=%ANDROID_QT5_DIR%\android_armv7\lib\cmake\ +@echo off +rem please add to environment ANDROID_QT5_DIR (path to Qt directory) and ANDROID_NDK_HOME (path to android ndk directory) +rem execute with Android API version and arch e. g. : #make_android.bat 24 arm ../libs +set _usage_=0 +if [%~1]==[] set _usage_=1 +if [%~2]==[] set _usage_=1 +if [%~3]==[] set _usage_=1 +if %_usage_%==1 ( + echo Usage: make_android.bat ^ ^ ^ + echo ^ ^ ^ - number of API ^(e.g. 19^) + echo ^ ^ ^ - architecture ^(arm, arm64, x86, x86_64^) + echo ^ ^ ^ - path to sources + echo. + echo You also have to set next env variables^: + echo ^ ^ ANDROID_QT5_DIR - path to Qt dir, contains subdirs for arch + echo ^ ^ ANDROID_NDK_HOME - path to android ndk directory + exit /b +) +set QARCH= +set AARCH= +if %~2==arm ( + set QARCH=armv7 + set AARCH=armeabi-v7a +) +if %~2==arm64 ( + set QARCH=arm64_v8a + set AARCH=arm64-v8a +) +if %~2==x86 ( + set QARCH=x86 + set AARCH=x86 +) +if %~2==x86_64 ( + echo Qt doesn`t support x86_64, building without Qt + set AARCH=x86_64 +) +set Qt5_ROOT=%ANDROID_QT5_DIR%\android_%QARCH%\lib\cmake set Qt5_DIR=%Qt5_ROOT%\Qt5 -set Qt5LinguistTools_DIR=%Qt5_ROOT%\Qt5LinguistTools -set Qt5UiPlugin_DIR=%Qt5_ROOT%\Qt5UiPlugin -set Qt5Widgets_DIR=%Qt5_ROOT%\Qt5Widgets -set Qt5Core_DIR=%Qt5_ROOT%\Qt5Core -set Qt5Gui_DIR=%Qt5_ROOT%\Qt5Gui -set Qt5Sql_DIR=%Qt5_ROOT%\Qt5Sql -set Qt5OpenGL_DIR=%Qt5_ROOT%\Qt5OpenGL -set Qt5Designer_DIR=%Qt5_ROOT%\Qt5Designer -set Qt5PrintSupport_DIR=%Qt5_ROOT%\Qt5PrintSupport -set Qt5Script_DIR=%Qt5_ROOT%\Qt5Script -cmake_mgw -Wno-dev -DCMAKE_TOOLCHAIN_FILE=%ANDROID_NDK_HOME%\build\cmake\android.toolchain.cmake -DANDROID_PLATFORM=android-%~1 -DICU=0 -DQt4=0 -DQt5=1 -DQGLVIEW=0 -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 -DQt5PrintSupport_DIR=%Qt5_ROOT%\Qt5PrintSupport -DQt5Script_DIR=%Qt5_ROOT%\Qt5Script ..\libs +if NOT [%QARCH%]==[] ( + @echo on + cmake_mgw -Wno-dev -DCMAKE_TOOLCHAIN_FILE=%ANDROID_NDK_HOME%\build\cmake\android.toolchain.cmake -DANDROID_STL=c++_shared -DANDROID_PLATFORM=android-%~1 -DANDROID_ABI=%AARCH% -DICU=0 -DQt4=0 -DQt5=1 -DQGLVIEW=0 -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 -DQt5PrintSupport_DIR=%Qt5_ROOT%\Qt5PrintSupport -DQt5Script_DIR=%Qt5_ROOT%\Qt5Script ..\libs +) else ( + @echo on + cmake_mgw -Wno-dev -DCMAKE_TOOLCHAIN_FILE=%ANDROID_NDK_HOME%\build\cmake\android.toolchain.cmake -DANDROID_STL=c++_shared -DANDROID_PLATFORM=android-%~1 -DANDROID_ABI=%AARCH% -DICU=0 -DQt4=0 -DQt5=0 -DQGLVIEW=0 ..\libs +) diff --git a/make_android64.bat b/make_android64.bat deleted file mode 100644 index a98fd12..0000000 --- a/make_android64.bat +++ /dev/null @@ -1,16 +0,0 @@ -:please add to environment ANDROID_QT5_DIR (path to Qt directory) and ANDROID_NDK_HOME (path to android ndk directory) -:execute with Android API version e. g. : #make_android.bat 24 - -set Qt5_ROOT=%ANDROID_QT5_DIR%\android_arm64_v8a\lib\cmake\ -set Qt5_DIR=%Qt5_ROOT%\Qt5 -set Qt5LinguistTools_DIR=%Qt5_ROOT%\Qt5LinguistTools -set Qt5UiPlugin_DIR=%Qt5_ROOT%\Qt5UiPlugin -set Qt5Widgets_DIR=%Qt5_ROOT%\Qt5Widgets -set Qt5Core_DIR=%Qt5_ROOT%\Qt5Core -set Qt5Gui_DIR=%Qt5_ROOT%\Qt5Gui -set Qt5Sql_DIR=%Qt5_ROOT%\Qt5Sql -set Qt5OpenGL_DIR=%Qt5_ROOT%\Qt5OpenGL -set Qt5Designer_DIR=%Qt5_ROOT%\Qt5Designer -set Qt5PrintSupport_DIR=%Qt5_ROOT%\Qt5PrintSupport -set Qt5Script_DIR=%Qt5_ROOT%\Qt5Script -cmake_mgw -Wno-dev -DCMAKE_TOOLCHAIN_FILE=%ANDROID_NDK_HOME%\build\cmake\android.toolchain.cmake -DANDROID_STL=c++_shared -DANDROID_PLATFORM=android-%~1 -DANDROID_ABI=arm64-v8a -DICU=0 -DQt4=0 -DQt5=1 -DQGLVIEW=0 -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 -DQt5PrintSupport_DIR=%Qt5_ROOT%\Qt5PrintSupport -DQt5Script_DIR=%Qt5_ROOT%\Qt5Script ..\libs