1
0
mirror of https://github.com/taigrr/wasm-experiments synced 2025-01-18 04:03:21 -08:00

Upgrade to Go 1.13

This commit is contained in:
Johan Brandhorst 2019-09-28 13:27:56 +01:00
parent 85aa3c48b7
commit 5160fa41e7
5 changed files with 18 additions and 11 deletions

View File

@ -52,13 +52,13 @@ tinygo-canvas: clean
.PHONY: ebiten
ebiten: clean
GO111MODULE=on GOOS=js GOARCH=wasm go build -o ./html/ebiten.wasm ./ebiten/main.go
GOOS=js GOARCH=wasm go build -o ./html/ebiten.wasm ./ebiten/main.go
cp ./ebiten/index.html ./html/index.html
cp $$(go env GOROOT)/misc/wasm/wasm_exec.js ./html/wasm_exec.js
.PHONY: vugu
vugu: clean
GO111MODULE=on go get github.com/vugu/vugu/cmd/vugugen
go install github.com/vugu/vugu/cmd/vugugen
vugugen --skip-go-mod --skip-main ./vugu/
GOOS=js GOARCH=wasm go build -o ./html/main.wasm ./vugu/
cp ./vugu/index.html ./html/
@ -66,7 +66,7 @@ vugu: clean
.PHONY: vecty
vecty: clean
GO111MODULE=on GOOS=js GOARCH=wasm go build -o ./html/test.wasm ./vecty/main.go
GOOS=js GOARCH=wasm go build -o ./html/test.wasm ./vecty/main.go
cp ./vecty/index.html ./html/index.html
cp $$(go env GOROOT)/misc/wasm/wasm_exec.js ./html/wasm_exec.js
@ -84,5 +84,5 @@ clean:
rm -f ./html/*
install-test:
go get github.com/agnivade/wasmbrowsertest
mv $$GOPATH/bin/wasmbrowsertest $$GOPATH/bin/go_js_wasm_exec
go install github.com/agnivade/wasmbrowsertest
mv $$(go env GOPATH)/bin/wasmbrowsertest $$(go env GOPATH)/bin/go_js_wasm_exec

View File

@ -4,7 +4,7 @@ Just some playing around with the experimental Go WebAssembly arch target.
## Requirements
Requires `go` >= 1.12.0.
Requires `go` >= 1.13.0.
[TinyGo](https://github.com/tinygo-org/tinygo) examples require `docker`.
## Basic instructions

4
go.mod
View File

@ -10,7 +10,7 @@ require (
github.com/microcosm-cc/bluemonday v1.0.2
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
github.com/slimsag/blackfriday v2.0.0+incompatible
github.com/vugu/vugu v0.0.0-20190518235128-5a84f26390d1
github.com/vugu/vugu v0.1.0
golang.org/x/image v0.0.0-20190618124811-92942e4437e2
golang.org/x/sys v0.0.0-20190621203818-d432491b9138 // indirect
golang.org/x/sys v0.0.0-20190712062909-fae7ac547cb7 // indirect
)

7
go.sum
View File

@ -52,8 +52,8 @@ github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasO
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/vugu/vugu v0.0.0-20190518235128-5a84f26390d1 h1:Iowi+7qqrJr/6RmZFIM8g6n6e8TENUNiOxex1xG/NHA=
github.com/vugu/vugu v0.0.0-20190518235128-5a84f26390d1/go.mod h1:JXaMmpEMpofCzJj8TmSWeLDxAajs4a4wrac5VYwj4A8=
github.com/vugu/vugu v0.1.0 h1:gJtz7jza90ZUKgLb1mu0Ql5x/wDV5pJxiqW7CPV+BJU=
github.com/vugu/vugu v0.1.0/go.mod h1:XcDIa6J18Rk/c56X88PTzawJTS2pSAGdTN6u5RE1ZWc=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/exp v0.0.0-20180710024300-14dda7b62fcd h1:nLIcFw7GiqKXUS7HiChg6OAYWgASB2H97dZKd1GhDSs=
golang.org/x/exp v0.0.0-20180710024300-14dda7b62fcd/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@ -74,7 +74,8 @@ golang.org/x/sys v0.0.0-20181228144115-9a3f9b0469bb/go.mod h1:STP8DvDyc/dI5b8T5h
golang.org/x/sys v0.0.0-20190203050204-7ae0202eb74c/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190621203818-d432491b9138/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190712062909-fae7ac547cb7 h1:LepdCS8Gf/MVejFIt8lsiexZATdoGVyp5bcyS+rYoUI=
golang.org/x/sys v0.0.0-20190712062909-fae7ac547cb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/tools v0.0.0-20190202235157-7414d4c1f71c/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190407030857-0fdf0c73855b/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=

6
tools.go Normal file
View File

@ -0,0 +1,6 @@
// +build tools
import (
_ "github.com/agnivade/wasmbrowsertest"
_ "github.com/vugu/vugu/cmd/vugugen"
)