From b80ba35992c44528821ee183c9be06decdeac4ef 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: Sun, 21 Apr 2019 15:15:28 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@531 a8b55f48-bf90-11e4-a774-851b48703e85 --- make_android.bat | 4 ++-- make_libs_android.bat | 6 ++++++ make_libs_android_all.bat | 8 ++------ 3 files changed, 10 insertions(+), 8 deletions(-) create mode 100644 make_libs_android.bat diff --git a/make_android.bat b/make_android.bat index 8c1dd6c..470a994 100644 --- a/make_android.bat +++ b/make_android.bat @@ -38,8 +38,8 @@ set Qt5_ROOT=%ANDROID_QT5_DIR%\android_%QARCH%\lib\cmake set Qt5_DIR=%Qt5_ROOT%\Qt5 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 -DQt5Positioning_DIR=%Qt5_ROOT%\Qt5Positioning ..\libs %~4 %~5 %~6 + 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 -DQt5Positioning_DIR=%Qt5_ROOT%\Qt5Positioning %~3 %~4 %~5 %~6 ) 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 %~4 %~5 %~6 + 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 %~3 %~4 %~5 %~6 ) diff --git a/make_libs_android.bat b/make_libs_android.bat new file mode 100644 index 0000000..20513cc --- /dev/null +++ b/make_libs_android.bat @@ -0,0 +1,6 @@ +@echo off +mkdir ..\libs_build_android_%~1 +cd ..\libs_build_android_%~1 +call ..\libs\make_android 19 %~1 ..\libs "-DUTILS=0" +call make install -j4 +cd ..\libs diff --git a/make_libs_android_all.bat b/make_libs_android_all.bat index 879beee..54eb321 100644 --- a/make_libs_android_all.bat +++ b/make_libs_android_all.bat @@ -1,8 +1,4 @@ @echo off -for %%a in (x86,arm,arm64) do ( - mkdir ..\libs_build_android_%%a - cd ..\libs_build_android_%%a - ..\libs\make_android 19 %%a ..\libs "-DUTILS=0" - make install -j4 - cd ..\libs +for %%a in (x86,arm) do ( + call .\make_libs_android %%a )