From 7570f9ff4c4dc0485912435665fb3d4b086de941 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?= =?UTF-8?q?=D1=80=D0=B5=D0=B9?= Date: Thu, 4 Oct 2018 12:12:11 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@441 a8b55f48-bf90-11e4-a774-851b48703e85 --- make_android.bat | 6 +++--- make_android64.bat | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/make_android.bat b/make_android.bat index 4ab6048..8c909ea 100644 --- a/make_android.bat +++ b/make_android.bat @@ -1,5 +1,5 @@ -:please add to environment ANDROID_QT5_DIR (path to Qt directory) and ANDROID_NDK_DIR (path to android ndk directory) -:execute with Android API version f. e. : #make_android.bat 24 +: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\ set Qt5_DIR=%Qt5_ROOT%\Qt5 @@ -13,4 +13,4 @@ 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_DIR%\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 +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 diff --git a/make_android64.bat b/make_android64.bat index a01f4ec..34f67a2 100644 --- a/make_android64.bat +++ b/make_android64.bat @@ -1,4 +1,4 @@ -:please add to environment ANDROID_QT5_DIR (path to Qt directory) and ANDROID_NDK_DIR (path to android ndk directory) -:execute with Android API version f. e. : #make_android.bat 24 +: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 -cmake_mgw -Wno-dev -DCMAKE_TOOLCHAIN_FILE=%ANDROID_NDK_DIR%\build\cmake\android.toolchain.cmake -DANDROID_PLATFORM=android-%~1 -DANDROID_ABI=arm64-v8a -DICU=0 -DQt4=0 -DQt5=0 -DQGLVIEW=0 ..\libs +cmake_mgw -Wno-dev -DCMAKE_TOOLCHAIN_FILE=%ANDROID_NDK_HOME%\build\cmake\android.toolchain.cmake -DANDROID_PLATFORM=android-%~1 -DANDROID_ABI=arm64-v8a -DICU=0 -DQt4=0 -DQt5=0 -DQGLVIEW=0 ..\libs