mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-11-12 22:17:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

cmd/ebitnmobile: Bug fix: using ebitenmobile with EBITENMOBILE_GOMOBILE failed

Browse Source 
Closes #1667
This commit is contained in:
Hajime Hoshi 2021-06-09 22:45:16 +09:00
parent ca331f3c67
commit b30d626e9a
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/ebitenmobile/gomobile.go
View File

@ -100,14 +100,25 @@ func prepareGomobileCommands() error {
os.Chdir(pwd) os.Chdir(pwd)
}() }()
if err := runGo("mod", "init", "ebitenmobiletemporary"); err != nil { const modname = "ebitenmobiletemporary"
if err := runGo("mod", "init", modname); err != nil {
return err
}
if err := os.WriteFile("tools.go", []byte(fmt.Sprintf(`// +build tools
package %s
import (
_ "golang.org/x/mobile/cmd/gobind"
_ "golang.org/x/mobile/cmd/gomobile"
)
`, modname)), 0644); err != nil {
return err return err
} }
// To record gomobile to go.sum for Go 1.16 and later, go-get gomobile instaed of golang.org/x/mobile (#1487). // To record gomobile to go.sum for Go 1.16 and later, go-get gomobile instaed of golang.org/x/mobile (#1487).
// This also records gobind as gomobile depends on gobind indirectly. // This also records gobind as gomobile depends on gobind indirectly.
// Using `...` doesn't work on Windows since mobile/internal/mobileinit cannot be compiled on Windows w/o Cgo (#1493). // Using `...` doesn't work on Windows since mobile/internal/mobileinit cannot be compiled on Windows w/o Cgo (#1493).
// Note that `go mod tidy` doesn't work since this removes all the indirect imports.
if err := runGo("get", "golang.org/x/mobile/cmd/gomobile@"+gomobileHash); err != nil { if err := runGo("get", "golang.org/x/mobile/cmd/gomobile@"+gomobileHash); err != nil {
return err return err
} }
@ -119,6 +130,9 @@ func prepareGomobileCommands() error {
return err return err
} }
} }
if err := runGo("mod", "tidy"); err != nil {
return err
}
if err := runGo("build", "-o", exe(filepath.Join("bin", "gomobile")), "golang.org/x/mobile/cmd/gomobile"); err != nil { if err := runGo("build", "-o", exe(filepath.Join("bin", "gomobile")), "golang.org/x/mobile/cmd/gomobile"); err != nil {
return err return err
} }