Skip to content

Commit

Permalink
Looks like qt5-static on mingw is completely broken, so do a dynamic …
Browse files Browse the repository at this point in the history
…build instead.
  • Loading branch information
davidgiven committed Jan 8, 2024
1 parent 05608a6 commit 713df87
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 8 deletions.
1 change: 0 additions & 1 deletion .github/workflows/ccpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ jobs:
mingw-w64-i686-zlib
mingw-w64-i686-png2ico
mingw-w64-i686-qt5-base
mingw-w64-i686-qt5-static
vim
zip
- name: update-protobuf
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ jobs:
mingw-w64-i686-zlib
mingw-w64-i686-png2ico
mingw-w64-i686-qt5-base
mingw-w64-i686-qt5-static
vim
zip
- uses: actions/checkout@v3
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@ ifeq ($(OS), Windows_NT)
MINGWBIN = /mingw32/bin
CCPREFIX = $(MINGWBIN)/
PKG_CONFIG = $(MINGWBIN)/pkg-config
WX_CONFIG = /usr/bin/sh $(MINGWBIN)/wx-config --static=yes
WX_CONFIG = /usr/bin/sh $(MINGWBIN)/wx-config
PROTOC = $(MINGWBIN)/protoc
WINDRES = windres
LDFLAGS += \
-Lc:/mingw32/qt5-static/lib \
-static
CXXFLAGS += \
-fext-numeric-literals \
-Wno-deprecated-enum-float-conversion \
-Wno-deprecated-enum-enum-conversion

# For static qt5.
#export PKG_CONFIG_PATH = $(MINGWBIN)/../qt5-static/lib/pkgconfig

# Required to get the gcc run - time libraries on the path.
export PATH := $(PATH):$(MINGWBIN)
endif
Expand Down
4 changes: 2 additions & 2 deletions src/gui2/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
srcs=[
"./main.cc",
],
cflags=["$(WX_CFLAGS)", "-fPIC"],
ldflags=["$(WX_LDFLAGS)"],
cflags=["-fPIC"],
ldflags=["$(QT5_EXTRA_LIBS)"],
deps=[
"+fl2_proto_lib",
"+protocol",
Expand Down

0 comments on commit 713df87

Please sign in to comment.