Switch to Go modules

Updated list of needed packages in README.md

.gitignore

@@ -1,2 +1 @@
-.gopath/
 bin/

Makefile

@@ -1,18 +1,13 @@
-build:
-	mkdir -p bin .gopath
-	if [ ! -L .gopath/src ]; then ln -s "$(CURDIR)/vendor" .gopath/src; fi
-	cd src && GOBIN="$(CURDIR)/bin/" GOPATH="$(CURDIR)/.gopath" go install && mv ../bin/src ../bin/wolfengo
+
+all: wolfengo test
+
+wolfengo:
+	go build -o bin/wolfengo ./src
 
 errcheck:
-	mkdir -p bin .gopath
-	if [ ! -L .gopath/src ]; then ln -s "$(CURDIR)/vendor" .gopath/src; fi
-	cd src && GOPATH="$(CURDIR)/.gopath" errcheck
+	errcheck ./src
 
 test:
-	mkdir -p bin .gopath
-	if [ ! -L .gopath/src ]; then ln -s "$(CURDIR)/vendor" .gopath/src; fi
-	cd src && GOPATH="$(CURDIR)/.gopath" go test -v
-
-all: build errcheck test
+	go test ./src
 
-.PHONY: all build errcheck test
+.PHONY: all wolfengo test errcheck

README.md

@@ -13,14 +13,12 @@ Pull requests are welcome.
 
 WolfenGo uses glfw C bindings, which in turn need some Linux userland headers to be installed. Example of dependencies installation on a Debian-based system:
 ```
-apt-get install libxcursor-dev libxrandr-dev libxinerama-dev libxi-dev
+apt-get install libgl1-mesa-dev libxcursor-dev libxrandr-dev libxinerama-dev libxi-dev libxxf86vm-dev
 ```
 
 # Building
 
 ```
-git submodule init
-git submodule update
 make
 ```
 

go.mod

@@ -0,0 +1,8 @@
+module github.com/gdm85/wolfengo
+
+go 1.13
+
+require (
+	github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7
+	github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1
+)

go.sum

@@ -0,0 +1,4 @@
+github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7 h1:SCYMcCJ89LjRGwEa0tRluNRiMjZHalQZrVrvTbPh+qw=
+github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7/go.mod h1:482civXOzJJCPzJ4ZOX/pwvXBWSnzD4OKMdH4ClKGbk=
+github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1 h1:QbL/5oDUmRBzO9/Z7Seo6zf912W/a6Sr4Eu0G/3Jho0=
+github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=

src/shader.go

@@ -63,13 +63,13 @@ func (s *Shader) addUniform(uniformName string) error {
 }
 
 func (s *Shader) getProgramInfoLog(context string) error {
-		var logLength int32
-		gl.GetProgramiv(s.program, gl.INFO_LOG_LENGTH, &logLength)
+	var logLength int32
+	gl.GetProgramiv(s.program, gl.INFO_LOG_LENGTH, &logLength)
 
-		log := strings.Repeat("\x00", int(logLength+1))
-		gl.GetProgramInfoLog(s.program, logLength, nil, gl.Str(log))
+	log := strings.Repeat("\x00", int(logLength+1))
+	gl.GetProgramInfoLog(s.program, logLength, nil, gl.Str(log))
 
-		return fmt.Errorf("%s: %s", context, log)
+	return fmt.Errorf("%s: %s", context, log)
 }
 
 func (s *Shader) getShaderInfoLog(shader uint32, context string) error {