Skip to content

Commit

Permalink
Fix Windows Icon
Browse files Browse the repository at this point in the history
  • Loading branch information
achhabra2 committed May 20, 2020
1 parent f656f51 commit f3ebb68
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 9 deletions.
Binary file modified .DS_Store
Binary file not shown.
7 changes: 4 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
compile:
export CGO_ENABLED=1
# export CGO_ENABLED=1
packr2
echo "Compiling for mac and windows"
GOOS=windows GOARCH=amd64 go build -o kqb-scoreboard.exe .
# GOOS=windows GOARCH=amd64 go build -o kqb-scoreboard.exe .
GOOS=darwin GOARCH=amd64 go build -o kqb-scoreboard .
packr2 clean
fyne-win:
Expand All @@ -14,4 +14,5 @@ fyne-mac:
packr2
GOOS=darwin GOARCH=amd64 go build -o kqb-scoreboard .
fyne package -os darwin -icon Icon.png
packr2 clean
packr2 clean
rm kqb-scoreboard
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Better KQB Scoreboard helps casters keep track of scores and display them beauti
KQB Scoreboard was written in Go and provides a browser widget interface for use with OBS.

## Instructions
1. Download the new GUI release from Github for your platform (Windows or Mac)
1. Download the new GUI release from [Github Releases Page](https://github.com/achhabra2/kqb-scoreboard/releases)
2. Unzip the file and run the App
3. Follow the on screen instructions for IGL or Custom Match Type
4. Create a browser source in OBS pointed at http://localhost:8080
Expand Down
10 changes: 10 additions & 0 deletions icon.go

Large diffs are not rendered by default.

14 changes: 9 additions & 5 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,19 @@ func setupLogs() {
}

func main() {
// Configure log output to file
setupLogs()
// var wg sync.WaitGroup
// wg.Add(1)

// Setup HTTP handler and websocket handler
StartHTTPServer()
// SetupCloseHandler()

// Create Fyne App
myApp := app.New()
myApp.SetIcon(resourceIconPng)
_ = GameType(myApp)
myApp.Run()
// RunMatch()
// wg.Wait()

// Called before application exist
tidyUp()
}

Expand All @@ -71,6 +74,7 @@ func GetTeamInfo(url string, c chan []Team) {
resp, err := http.Get(url)
if err != nil {
// handle error
log.Println("Could not fetch team info from IGL")
}
defer resp.Body.Close()
body, err := ioutil.ReadAll(resp.Body)
Expand Down

0 comments on commit f3ebb68

Please sign in to comment.