Fix up makefile. Fix linter complaints.
parent
f2cd54f501
commit
b2d3111d7c
15
Makefile
15
Makefile
|
@ -1,15 +1,20 @@
|
|||
EXECUTABLE=project-ely
|
||||
GO=go
|
||||
GO_BUILD=build -x -v
|
||||
GO_BUILD_DEBUG=${GO_BUILD} -gcflags=all="-N -l"
|
||||
GO_BUILD_RELEASE=${GO_BUILD} -trimpath -tags static -ldflags "-s -w"
|
||||
GO_BUILD_RELEASE_WINDOWS=${GO_BUILD} -trimpath -tags static -ldflags "-s -w -H windowsgui"
|
||||
|
||||
all: release
|
||||
|
||||
dependencies:
|
||||
go mod tidy
|
||||
${GO} mod tidy
|
||||
|
||||
debug: linter dependencies
|
||||
go build -x -v -gcflags=all="-N -l"
|
||||
${GO} ${GO_BUILD_DEBUG}
|
||||
|
||||
release: linter dependencies
|
||||
go build -x -v -ldflags "-s -w"
|
||||
${GO} ${GO_BUILD_RELEASE}
|
||||
|
||||
linter:
|
||||
golangci-lint run
|
||||
|
@ -24,14 +29,14 @@ cross_windows:
|
|||
CC=x86_64-w64-mingw32-gcc \
|
||||
GOOS=windows \
|
||||
GOARCH=amd64 \
|
||||
go build -x -v -ldflags "-s -w"
|
||||
${GO} ${GO_BUILD_RELEASE}
|
||||
|
||||
cross_windows_x86:
|
||||
CGO_ENABLED=1 \
|
||||
CC=i686-w64-mingw32-gcc \
|
||||
GOOS=windows \
|
||||
GOARCH=386 \
|
||||
go build -x -v -ldflags "-s -w"
|
||||
${GO} ${GO_BUILD_RELEASE}
|
||||
|
||||
goimports_everything:
|
||||
find . -name "*.go" -exec goimports -w {} \;
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
package game
|
||||
|
||||
import (
|
||||
"log"
|
||||
|
||||
"github.com/veandco/go-sdl2/sdl"
|
||||
)
|
||||
|
||||
|
@ -40,7 +42,10 @@ func NewWindow(title string) (*window, error) {
|
|||
func (g *window) Destroy() {
|
||||
if g.SdlWindow != nil {
|
||||
sdl.Do(func() {
|
||||
g.SdlWindow.Destroy()
|
||||
err := g.SdlWindow.Destroy()
|
||||
if err != nil {
|
||||
log.Printf("error destroying SdlWindow: %v\n", err)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
|
27
main.go
27
main.go
|
@ -71,7 +71,10 @@ func run(configMap gosimpleconf.ConfigMap) error {
|
|||
}
|
||||
defer func() {
|
||||
sdl.Do(func() {
|
||||
renderer.Destroy()
|
||||
err = renderer.Destroy()
|
||||
if err != nil {
|
||||
log.Printf("error destroying renderer: %v\n", err)
|
||||
}
|
||||
})
|
||||
}()
|
||||
|
||||
|
@ -99,7 +102,11 @@ func run(configMap gosimpleconf.ConfigMap) error {
|
|||
}
|
||||
defer func() {
|
||||
sdl.Do(func() {
|
||||
penguinTexture.Destroy()
|
||||
err = penguinTexture.Destroy()
|
||||
if err != nil {
|
||||
log.Printf("error destroying renderer: %v\n", err)
|
||||
}
|
||||
|
||||
})
|
||||
}()
|
||||
|
||||
|
@ -170,15 +177,25 @@ func run(configMap gosimpleconf.ConfigMap) error {
|
|||
|
||||
// Background
|
||||
sdl.Do(func() {
|
||||
renderer.SetDrawColor(0, 120, 0, 255)
|
||||
renderer.Clear()
|
||||
err = renderer.SetDrawColor(0, 120, 0, 255)
|
||||
if err != nil {
|
||||
log.Printf("error in renderer.SetDrawColor: %v\n", err)
|
||||
}
|
||||
|
||||
err = renderer.Clear()
|
||||
if err != nil {
|
||||
log.Printf("error in renderer.Clear: %v\n", err)
|
||||
}
|
||||
})
|
||||
|
||||
// Square
|
||||
sdl.Do(func() {
|
||||
//renderer.SetDrawColor(0, 0, 255, 255)
|
||||
rect = &sdl.Rect{X: x, Y: y, W: 200, H: 200}
|
||||
renderer.Copy(penguinTexture, penguinRect, rect)
|
||||
err = renderer.Copy(penguinTexture, penguinRect, rect)
|
||||
if err != nil {
|
||||
log.Printf("error in renderer.Copy: %v\n", err)
|
||||
}
|
||||
//renderer.DrawRect(rect)
|
||||
//renderer.FillRect(rect)
|
||||
})
|
||||
|
|
Loading…
Reference in New Issue