Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/packaging/android/androidbuild.sh b/packaging/android/androidbuild.sh
- index 22ca1c2b34..8bf0602c21 100755
- --- a/packaging/android/androidbuild.sh
- +++ b/packaging/android/androidbuild.sh
- @@ -65,9 +65,11 @@ build_qt() {
- echo "Qt path provided; Skipping Qt build"
- return 0
- fi
- - cd $DEPS_BUILD
- +
- configure_ext
- - cmake --build . -j $PROC_COUNT --config $BUILD_TYPE --target ext_qt
- + cd $DEPS_BUILD
- +
- + cmake --build . --config $BUILD_TYPE --target ext_qt -- -j$PROC_COUNT
- cd $BUILD_ROOT
- }
- @@ -78,21 +80,23 @@ build_ext() {
- exit
- fi
- - cd $DEPS_BUILD
- +
- configure_ext
- + cd $DEPS_BUILD
- +
- # Please do not change the order
- - cmake --build . -j $PROC_COUNT --config $BUILD_TYPE --target ext_png
- - cmake --build . -j $PROC_COUNT --config $BUILD_TYPE --target ext_zlib
- - cmake --build . -j $PROC_COUNT --config $BUILD_TYPE --target ext_quazip
- - cmake --build . -j $PROC_COUNT --config $BUILD_TYPE --target ext_lcms2
- - cmake --build . -j $PROC_COUNT --config $BUILD_TYPE --target ext_expat
- - cmake --build . -j $PROC_COUNT --config $BUILD_TYPE --target ext_exiv2
- - cmake --build . -j $PROC_COUNT --config $BUILD_TYPE --target ext_gsl
- - cmake --build . -j $PROC_COUNT --config $BUILD_TYPE --target ext_tiff
- - cmake --build . -j $PROC_COUNT --config $BUILD_TYPE --target ext_fftw3
- - cmake --build . -j $PROC_COUNT --config $BUILD_TYPE --target ext_jpeg
- - cmake --build . -j $PROC_COUNT --config $BUILD_TYPE --target ext_giflib
- - cmake --build . -j $PROC_COUNT --config $BUILD_TYPE --target ext_eigen3
- + cmake --build . --config $BUILD_TYPE --target ext_png -- -j$PROC_COUNT
- + cmake --build . --config $BUILD_TYPE --target ext_zlib -- -j$PROC_COUNT
- + cmake --build . --config $BUILD_TYPE --target ext_quazip -- -j$PROC_COUNT
- + cmake --build . --config $BUILD_TYPE --target ext_lcms2 -- -j$PROC_COUNT
- + cmake --build . --config $BUILD_TYPE --target ext_expat -- -j$PROC_COUNT
- + cmake --build . --config $BUILD_TYPE --target ext_exiv2 -- -j$PROC_COUNT
- + cmake --build . --config $BUILD_TYPE --target ext_gsl -- -j$PROC_COUNT
- + cmake --build . --config $BUILD_TYPE --target ext_tiff -- -j$PROC_COUNT
- + cmake --build . --config $BUILD_TYPE --target ext_fftw3 -- -j$PROC_COUNT
- + cmake --build . --config $BUILD_TYPE --target ext_jpeg -- -j$PROC_COUNT
- + cmake --build . --config $BUILD_TYPE --target ext_giflib -- -j$PROC_COUNT
- + cmake --build . --config $BUILD_TYPE --target ext_eigen3 -- -j$PROC_COUNT
- cd $BUILD_ROOT
- }
- lines 1-55/55 (END)
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement