lib/cutego
1
0
Fork 0
mirror of https://github.com/bluszcz/cutego.git synced 2024-09-28 21:25:16 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix msys2 static + bump android build tool to 25.0.3

Browse source
This commit is contained in:
therecipe 2017-04-30 00:15:23 +02:00
parent aaad1a05d2
commit 2274d39b53
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -361,7 +361,7 @@ These are some general environmental variables, you can find the target specific
- Install the SDK dependencies with `C:\android-sdk-windows\tools\android.bat` or `$HOME/android-sdk-{macosx|linux }/tools/android`
- Tools
- Android SDK Build-tools (25.0.2)
- Android SDK Build-tools (25.0.3)
- Android 7.1.1 (API 25)
- SDK Platform
- Extras (Windows only)

2
internal/cmd/deploy/assets.go
View file

@ -74,7 +74,7 @@ func android_config(target, path, depPath string) string {
}{
Qt: filepath.Join(utils.QT_DIR(), utils.QT_VERSION_MAJOR(), "android_armv7"),
Sdk: utils.ANDROID_SDK_DIR(),
SdkBuildToolsRevision: "25.0.2",
SdkBuildToolsRevision: "25.0.3",
Ndk: utils.ANDROID_NDK_DIR(),
Toolchainprefix: "arm-linux-androideabi",
Toolprefix: "arm-linux-androideabi",

3
internal/utils/env.go
View file

@ -99,6 +99,9 @@ func ToolPath(tool, target string) string {
case "windows":
if runtime.GOOS == target {
if QT_MSYS2() {
if QT_MSYS2_STATIC() {
return filepath.Join(QT_MSYS2_DIR(), "qt5-static", "bin", tool)
}
return filepath.Join(QT_MSYS2_DIR(), "bin", tool)
}
return filepath.Join(QT_DIR(), QT_VERSION_MAJOR(), "mingw53_32", "bin", tool)