Skip to content

Commit a30413f

Browse files
committed
Try to fix the windows build
1 parent 8d0e6e1 commit a30413f

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

.github/workflows/build-windows.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,11 @@ jobs:
3838
run: |
3939
cd cmd/go2tv
4040
sed -i "s/version = \"dev\"/version = \"$(echo ${{ env.GO2TV_VERSION }} | sed 's/^v//')\"/" go2tv.go
41-
CGO_ENABLED=1 CC=gcc CXX=g++ go run fyne.io/tools/cmd/fyne@latest package --release --app-id app.go2tv.go2tv --os windows --icon ../../assets/go2tv-icon.png
41+
CC_BIN="$(command -v x86_64-w64-mingw32-gcc-win32 || command -v gcc)"
42+
CXX_BIN="$(command -v x86_64-w64-mingw32-g++-win32 || command -v g++)"
43+
CGO_ENABLED=1 CC="$CC_BIN" CXX="$CXX_BIN" CGO_LDFLAGS="-static -static-libgcc -static-libstdc++ -Wl,-Bstatic -l:libstdc++.a -Wl,-Bdynamic" GOFLAGS="-ldflags=-linkmode=external -ldflags=-extldflags=-static" go run fyne.io/tools/cmd/fyne@latest package --release --app-id app.go2tv.go2tv --os windows --icon ../../assets/go2tv-icon.png
44+
objdump -p go2tv.exe | grep "DLL Name" | tee /tmp/go2tv-imports.txt
45+
! grep -Eq "libwinpthread-1.dll|libstdc\+\+-6.dll" /tmp/go2tv-imports.txt
4246
mv go2tv.exe ../../
4347
4448
- uses: actions/upload-artifact@v6

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ wayland: clean
2828
go build -tags "$(TAGS),wayland" -trimpath -ldflags $(LDFLAGS) -o $(BIN) ./cmd/go2tv
2929

3030
windows: clean
31-
env CGO_ENABLED=1 CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ GOOS=windows GOARCH=amd64 go build -tags "$(TAGS)" -trimpath -ldflags $(LDFLAGS_WINDOWS) -o $(BIN_WIN) ./cmd/go2tv
31+
env CGO_ENABLED=1 CC=$$(command -v x86_64-w64-mingw32-gcc-win32 || echo x86_64-w64-mingw32-gcc) CXX=$$(command -v x86_64-w64-mingw32-g++-win32 || echo x86_64-w64-mingw32-g++) CGO_LDFLAGS="-static -static-libgcc -static-libstdc++ -Wl,-Bstatic -l:libstdc++.a -Wl,-Bdynamic" GOOS=windows GOARCH=amd64 go build -tags "$(TAGS)" -trimpath -ldflags "$(LDFLAGS_WINDOWS) -linkmode external -extldflags '-static'" -o $(BIN_WIN) ./cmd/go2tv
3232

3333

3434
install: build

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ require (
1818
github.com/saintfish/chardet v0.0.0-20230101081208-5e3ef4b5456d
1919
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
2020
github.com/vishen/go-chromecast v0.3.4
21-
go2tv.app/screencast v0.0.0-20260221145416-66028c7b60e3
21+
go2tv.app/screencast v0.0.0-20260222093814-dd264599ec8b
2222
golang.org/x/mod v0.33.0
2323
golang.org/x/time v0.14.0
2424
)

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,8 @@ github.com/yuin/goldmark v1.7.16 h1:n+CJdUxaFMiDUNnWC3dMWCIQJSkxH4uz3ZwQBkAlVNE=
173173
github.com/yuin/goldmark v1.7.16/go.mod h1:ip/1k0VRfGynBgxOz0yCqHrbZXhcjxyuS66Brc7iBKg=
174174
go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
175175
go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
176-
go2tv.app/screencast v0.0.0-20260221145416-66028c7b60e3 h1:+vqhWlYFEDTWhfvFaSVrGyk9NOUdUlPHxDuWsTSrqus=
177-
go2tv.app/screencast v0.0.0-20260221145416-66028c7b60e3/go.mod h1:SuTkH1JeLAuYESPe0rmpmqmprr+Q2Z/Dfh2t4oHlCMM=
176+
go2tv.app/screencast v0.0.0-20260222093814-dd264599ec8b h1:PfV/SDn6qqnPzViWcB5TGFGLZiFccHFNOavxiiXqPew=
177+
go2tv.app/screencast v0.0.0-20260222093814-dd264599ec8b/go.mod h1:SuTkH1JeLAuYESPe0rmpmqmprr+Q2Z/Dfh2t4oHlCMM=
178178
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
179179
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
180180
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=

0 commit comments

Comments
 (0)