diff options
Diffstat (limited to 'coin/provisioning')
-rw-r--r-- | coin/provisioning/common/windows/android-openssl.ps1 | 2 | ||||
-rw-r--r-- | coin/provisioning/common/windows/msys.ps1 (renamed from coin/provisioning/qtci-windows-7-x86/04-msys.ps1) | 2 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/04-msys.ps1 | 1 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/10-openssl_for_android.ps1 (renamed from coin/provisioning/qtci-windows-7-x86/31-android_openssl.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/40-android.ps1 (renamed from coin/provisioning/qtci-windows-7-x86/30-android.ps1) | 0 |
5 files changed, 3 insertions, 2 deletions
diff --git a/coin/provisioning/common/windows/android-openssl.ps1 b/coin/provisioning/common/windows/android-openssl.ps1 index 5390dfae..4fe5e5ee 100644 --- a/coin/provisioning/common/windows/android-openssl.ps1 +++ b/coin/provisioning/common/windows/android-openssl.ps1 @@ -54,7 +54,7 @@ Remove-Item -Path $zip Remove-Item C:\Utils\openssl-$version.tar Set-EnvironmentVariable "CC" "C:\utils\Android\android-ndk-r18b\toolchains\llvm\prebuilt\windows\bin\clang" -Set-EnvironmentVariable "AR" "C:\utils\Android\android-ndk-r18b\toolchains\llvm\prebuilt\windows\bin\llvm-ar" +Set-EnvironmentVariable "ANDROID_AR" "C:\utils\Android\android-ndk-r18b\toolchains\llvm\prebuilt\windows\bin\llvm-ar" Set-EnvironmentVariable "ANDROID_DEV" "C:\utils\Android\android-ndk-r18b\platforms\android-21\arch-arm\usr" # Make sure configure for openssl has a "make" and "perl" available diff --git a/coin/provisioning/qtci-windows-7-x86/04-msys.ps1 b/coin/provisioning/common/windows/msys.ps1 index 24d7a5ca..df67cc20 100644 --- a/coin/provisioning/qtci-windows-7-x86/04-msys.ps1 +++ b/coin/provisioning/common/windows/msys.ps1 @@ -1,4 +1,4 @@ -. "$PSScriptRoot\..\common\windows\helpers.ps1" +. "$PSScriptRoot\helpers.ps1" # This script will install msys which is needed for configuring openssl for Android diff --git a/coin/provisioning/qtci-windows-10-x86_64/04-msys.ps1 b/coin/provisioning/qtci-windows-10-x86_64/04-msys.ps1 new file mode 100644 index 00000000..44efea92 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/04-msys.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\msys.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/31-android_openssl.ps1 b/coin/provisioning/qtci-windows-10-x86_64/10-openssl_for_android.ps1 index 25c6f28a..25c6f28a 100644 --- a/coin/provisioning/qtci-windows-7-x86/31-android_openssl.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/10-openssl_for_android.ps1 diff --git a/coin/provisioning/qtci-windows-7-x86/30-android.ps1 b/coin/provisioning/qtci-windows-10-x86_64/40-android.ps1 index 69799974..69799974 100644 --- a/coin/provisioning/qtci-windows-7-x86/30-android.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/40-android.ps1 |