From 291badc149e90610dd94f5d658f8fc648541f0b5 Mon Sep 17 00:00:00 2001 From: Ugljesa Jovanovic Date: Sat, 13 Jun 2020 09:25:54 +0200 Subject: [PATCH] Build everyting on mingw --- sodiumWrapper/makeMingwX86-64.sh | 9 +++------ windowsBuild.sh | 10 +++++++--- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/sodiumWrapper/makeMingwX86-64.sh b/sodiumWrapper/makeMingwX86-64.sh index 9e76127..73d9cd4 100755 --- a/sodiumWrapper/makeMingwX86-64.sh +++ b/sodiumWrapper/makeMingwX86-64.sh @@ -1,9 +1,6 @@ #!/bin/sh ./configureMingw64.sh echo "Configure done" -$GNU_MAKE -j4 -C libsodium clean -$GNU_MAKE -j4 -C libsodium -$GNU_MAKE -j4 -C libsodium install -#make -j4 -C libsodium clean -#make -j4 -C libsodium -#make -j4 -C libsodium install +make -j32 -C libsodium clean +make -j32 -C libsodium +make -j32 -C libsodium install diff --git a/windowsBuild.sh b/windowsBuild.sh index f80432e..74773df 100755 --- a/windowsBuild.sh +++ b/windowsBuild.sh @@ -5,12 +5,16 @@ set +daae ./gradlew multiplatform-crypto-api:build cd sodiumWrapper echo "Starting mingw libsodium build" -./makeMingwX86-64.sh +./configureMingw64.sh +echo "Configure done" +$GNU_MAKE -j4 -C libsodium clean +$GNU_MAKE -j4 -C libsodium +$GNU_MAKE -j4 -C libsodium install echo "completed libsodium build" #now we can do the delegated build cd .. -#./gradlew multiplatform-crypto-delegated:build +./gradlew multiplatform-crypto-delegated:build #and finally pure build -#./gradlew multiplatform-crypto:build +./gradlew multiplatform-crypto:build set +e