diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 87188d3..94bab7f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: Build Environment +name: Legacy Makefile Build Environment on: [push, pull_request] @@ -78,6 +78,13 @@ jobs: make binutils gcc + wxwidgets3.2-common + wxwidgets3.2-common-libs + wxwidgets3.2-gtk3 + wxwidgets3.2-gtk3-libs + wxwidgets3.2-msw + wxwidgets3.2-msw-cb_headers + wxwidgets3.2-msw-libs - name: Build shell: msys2 {0} run: | diff --git a/Makefile b/Makefile index 296ceb9..0206a1a 100644 --- a/Makefile +++ b/Makefile @@ -39,7 +39,8 @@ WXVERSION=3.2 EXE=.exe COMMON_SRCS+=WinSerialPort.cpp WinPortFactory.cpp COMMON_LDFLAGS=-Wl,--enable-auto-import -static -static-libstdc++ -static-libgcc -COMMON_LIBS=-ltermcap -Wl,--as-needed -lsetupapi +COMMON_LIBS=-ltermcap -Wl,--as-needed -lsetupapi -lole32 +COMMON_CXXFLAGS=-std=c++14 BOSSA_RC=BossaRes.rc WIXDIR="C:\Program Files (x86)\WiX Toolset v3.11\bin" CODE_SIGN=$(INSTALLDIR)\\code_sign.p12