From 8b4ba5a1ed538933f6e10e459ab6b838ec22c2ac 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: Fri, 14 Sep 2018 12:26:42 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@423 a8b55f48-bf90-11e4-a774-851b48703e85 --- make_android.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/make_android.bat b/make_android.bat index 516bf49..3903263 100644 --- a/make_android.bat +++ b/make_android.bat @@ -1,4 +1,4 @@ -set Qt5_ROOT=d:\Qt\5.11.0\android_armv7\lib\cmake\ +set Qt5_ROOT=D:\Qt\5.12.0\android_armv7\lib\cmake\ set Qt5_DIR=%Qt5_ROOT%\Qt5 set Qt5LinguistTools_DIR=%Qt5_ROOT%\Qt5LinguistTools set Qt5UiPlugin_DIR=%Qt5_ROOT%\Qt5UiPlugin @@ -10,6 +10,6 @@ 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=d:\Distrib\Android\android-sdk-windows\ndk-bundle\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=d:\Distrib\Android\sdk-windows\ndk-bundle\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=d:\Distrib\Android\android-sdk-windows\ndk-bundle\build\cmake\android.toolchain.cmake -DANDROID_PLATFORM=android-24 -DICU=0 -DQt4=0 -DQt5=1 -DQt5_DIR=%Qt5_ROOT%\Qt5 ..\libs