mirror of
https://github.com/bluszcz/cutego.git
synced 2024-09-28 21:25:16 +03:00
Merge pull request #585 from creedr/master
Fix for MSYS2 being installed on drive other than C:\
This commit is contained in:
commit
3de5d57381
1 changed files with 3 additions and 1 deletions
|
@ -5,6 +5,7 @@ import (
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"runtime"
|
"runtime"
|
||||||
|
"strings"
|
||||||
)
|
)
|
||||||
|
|
||||||
func QT_MSYS2() bool {
|
func QT_MSYS2() bool {
|
||||||
|
@ -18,6 +19,7 @@ func QT_MSYS2_DIR() string {
|
||||||
}
|
}
|
||||||
return filepath.Join(dir, "mingw32")
|
return filepath.Join(dir, "mingw32")
|
||||||
}
|
}
|
||||||
|
drive := strings.Split(dir, string(os.PathSeparator))[0]
|
||||||
prefix := "msys32"
|
prefix := "msys32"
|
||||||
if runtime.GOARCH == "amd64" {
|
if runtime.GOARCH == "amd64" {
|
||||||
prefix = "msys64"
|
prefix = "msys64"
|
||||||
|
@ -26,7 +28,7 @@ func QT_MSYS2_DIR() string {
|
||||||
if QT_MSYS2_ARCH() == "amd64" {
|
if QT_MSYS2_ARCH() == "amd64" {
|
||||||
suffix = "mingw64"
|
suffix = "mingw64"
|
||||||
}
|
}
|
||||||
return fmt.Sprintf("C:\\%v\\%v", prefix, suffix)
|
return fmt.Sprintf("%v\\%v\\%v", drive, prefix, suffix)
|
||||||
}
|
}
|
||||||
|
|
||||||
func IsMsys2QtDir() bool {
|
func IsMsys2QtDir() bool {
|
||||||
|
|
Loading…
Reference in a new issue