fix: adds cgo per platform files

zsa · Aug 15, 2019 · 68960e4 · 68960e4
1 parent b38ece1
commit 68960e4
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 5 deletions.
diff --git a/build.linux.sh b/build.linux.sh
@@ -5,5 +5,3 @@ cd ..
 go-bindata -prefix "ui/build" -o assets.go ui/build/index.dist.js
 go build -tags dist -o dist/linux64/wally
 go build -o dist/linux64/wally-cli cli/main.go
-upx dist/linux64/wally
-upx dist/linux64/wally-cli
diff --git a/wally/dfu.go b/wally/dfu.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"github.com/google/gousb"
 	"io/ioutil"
-	"runtime"
 	"time"
 )
 

diff --git a/wally/ergoboot.c → wally/ergoboot_darwin.c b/wally/ergoboot.c → wally/ergoboot_darwin.c
diff --git a/wally/ergoboot_darwin.go b/wally/ergoboot_darwin.go
@@ -0,0 +1,15 @@
+// +build darwin
+
+package wally
+
+/*
+#cgo darwin CFLAGS: -O2 -Wall -mmacosx-version-min=10.8
+#cgo darwin LDFLAGS: -framework IOKit -framework CoreFoundation -mmacosx-version-min=10.8
+#include "ergoboot.h"
+
+*/
+import "C"
+
+func Ergoboot() {
+	C.ergoboot()
+}
diff --git a/wally/ergoboot_linux.go b/wally/ergoboot_linux.go
@@ -0,0 +1,8 @@
+package wally
+
+import "C"
+
+// Ergoboot: Placeholder
+func Ergoboot() {
+
+}
diff --git a/wally/ergoboot_windows.go b/wally/ergoboot_windows.go
@@ -0,0 +1,8 @@
+package wally
+
+import "C"
+
+// Ergoboot: Placeholder
+func Ergoboot() {
+
+}
diff --git a/wally/state.go b/wally/state.go
@@ -44,7 +44,7 @@ func NewState(step int8, filePath string) State {
 	case "darwin":
 		s.AppVersion = "1.1.1"
 	case "linux":
-		s.AppVersion = "1.1.0"
+		s.AppVersion = "1.1.1"
 	case "windows":
 		s.AppVersion = "1.1.4"
 	default:

diff --git a/wally/usb.go b/wally/usb.go
@@ -3,7 +3,6 @@ package wally
 import (
 	"fmt"
 	"github.com/google/gousb"
-	"runtime"
 )
 
 type Device struct {