summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile20
-rw-r--r--main.go2
2 files changed, 18 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index cfc2e1b..fadf5c0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,24 @@
.PHONY: debian
+VERSION = $(shell git describe --tags)
+BUILDTIME = $(shell date +%Y.%m.%d)
-all: build debian
- # GO111MODULE=off go build -o build main.go
+all: build
+ @echo fixme
-build: nocui gocui andlabs
+build:
+ GO111MODULE=off go build \
+ -ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}"
+
+verbose:
+ GO111MODULE=off go build -v -x \
+ -ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}"
+
+install:
+ GO111MODULE=off go install \
+ -ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}"
+
+build:
goimports:
goimports -w *.go
diff --git a/main.go b/main.go
index 9865f61..7f78565 100644
--- a/main.go
+++ b/main.go
@@ -10,7 +10,7 @@ var myGui *gui.Node // This is the beginning of the binary tree of widgets
// go will sit here until the window exits
func main() {
myGui = gui.New().Default()
- myGui.LoadToolkit("nocui")
+ // myGui.LoadToolkit("nocui")
buildworld()
gui.Watchdog()