Advertisement
Guest User

Untitled

a guest
Jun 26th, 2019
71
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.67 KB | None | 0 0
  1. diff --git a/packaging/android/androidbuild.sh b/packaging/android/androidbuild.sh
  2. index 22ca1c2b34..8bf0602c21 100755
  3. --- a/packaging/android/androidbuild.sh
  4. +++ b/packaging/android/androidbuild.sh
  5. @@ -65,9 +65,11 @@ build_qt() {
  6. echo "Qt path provided; Skipping Qt build"
  7. return 0
  8. fi
  9. - cd $DEPS_BUILD
  10. +
  11. configure_ext
  12. - cmake --build . -j $PROC_COUNT --config $BUILD_TYPE --target ext_qt
  13. + cd $DEPS_BUILD
  14. +
  15. + cmake --build . --config $BUILD_TYPE --target ext_qt -- -j$PROC_COUNT
  16. cd $BUILD_ROOT
  17. }
  18.  
  19. @@ -78,21 +80,23 @@ build_ext() {
  20. exit
  21. fi
  22.  
  23. - cd $DEPS_BUILD
  24. +
  25. configure_ext
  26. + cd $DEPS_BUILD
  27. +
  28. # Please do not change the order
  29. - cmake --build . -j $PROC_COUNT --config $BUILD_TYPE --target ext_png
  30. - cmake --build . -j $PROC_COUNT --config $BUILD_TYPE --target ext_zlib
  31. - cmake --build . -j $PROC_COUNT --config $BUILD_TYPE --target ext_quazip
  32. - cmake --build . -j $PROC_COUNT --config $BUILD_TYPE --target ext_lcms2
  33. - cmake --build . -j $PROC_COUNT --config $BUILD_TYPE --target ext_expat
  34. - cmake --build . -j $PROC_COUNT --config $BUILD_TYPE --target ext_exiv2
  35. - cmake --build . -j $PROC_COUNT --config $BUILD_TYPE --target ext_gsl
  36. - cmake --build . -j $PROC_COUNT --config $BUILD_TYPE --target ext_tiff
  37. - cmake --build . -j $PROC_COUNT --config $BUILD_TYPE --target ext_fftw3
  38. - cmake --build . -j $PROC_COUNT --config $BUILD_TYPE --target ext_jpeg
  39. - cmake --build . -j $PROC_COUNT --config $BUILD_TYPE --target ext_giflib
  40. - cmake --build . -j $PROC_COUNT --config $BUILD_TYPE --target ext_eigen3
  41. + cmake --build . --config $BUILD_TYPE --target ext_png -- -j$PROC_COUNT
  42. + cmake --build . --config $BUILD_TYPE --target ext_zlib -- -j$PROC_COUNT
  43. + cmake --build . --config $BUILD_TYPE --target ext_quazip -- -j$PROC_COUNT
  44. + cmake --build . --config $BUILD_TYPE --target ext_lcms2 -- -j$PROC_COUNT
  45. + cmake --build . --config $BUILD_TYPE --target ext_expat -- -j$PROC_COUNT
  46. + cmake --build . --config $BUILD_TYPE --target ext_exiv2 -- -j$PROC_COUNT
  47. + cmake --build . --config $BUILD_TYPE --target ext_gsl -- -j$PROC_COUNT
  48. + cmake --build . --config $BUILD_TYPE --target ext_tiff -- -j$PROC_COUNT
  49. + cmake --build . --config $BUILD_TYPE --target ext_fftw3 -- -j$PROC_COUNT
  50. + cmake --build . --config $BUILD_TYPE --target ext_jpeg -- -j$PROC_COUNT
  51. + cmake --build . --config $BUILD_TYPE --target ext_giflib -- -j$PROC_COUNT
  52. + cmake --build . --config $BUILD_TYPE --target ext_eigen3 -- -j$PROC_COUNT
  53.  
  54. cd $BUILD_ROOT
  55. }
  56. lines 1-55/55 (END)
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement