Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

[CI][MinGW] Fix build on ubuntu-latest 

Signed-off-by: Vitalii Koshura <lestat.de.lionkur@gmail.com>
This commit is contained in:
Vitalii Koshura 2023-02-07 15:10:42 +01:00
parent 9e74209828
commit c14adf6c37
No known key found for this signature in database
GPG Key ID: CE0DB1726070A5A3
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/mingw.yml vendored
View File

@ -19,7 +19,7 @@ env:
jobs:
build:
name: ${{ matrix.type }}-build
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
strategy:
matrix:
type: [libs-mingw, apps-mingw, apps-mingw-vcpkg, libs-mingw-cmake]

6
lib/Makefile.mingw
View File

@ -138,7 +138,7 @@ BIN = $(OCL_BIN) $(LIB_BIN) $(GPH_BIN)
# -gstabs is necessary for MinGWs backtrace to work
#DEBUG = -D__DEBUG__ -gstabs -g3
DEBUG ?= -DNDEBUG
DEBUG ?= -DNDEBUG
# where to find headers
INCS = -I"$(BOINC_SRC)" -I"$(BOINC_SRC)/db" -I"$(BOINC_SRC)/lib" -I"$(BOINC_SRC)/api" -I"$(BOINC_SRC)/zip" -I"$(BOINC_SRC)/win_build"
@ -163,9 +163,9 @@ ZIP_BOINC_RENAMES = \
-Dget_crc_table=get_crc_table_boinc \
-Dlongest_match=longest_match_boinc \
-Dinflate_codes=inflate_codes_boinc
ZIP_FLAGS = $(ZIP_VCPROJ_FLAGS) $(ZIP_BOINC_RENAMES) -DUSE_MINGW_GLOBBING -DUSE_STRM_INPUT $(INCS) -O2 $(NOCYGWIN)
ZIP_FLAGS = $(ZIP_VCPROJ_FLAGS) $(ZIP_BOINC_RENAMES) -DUSE_MINGW_GLOBBING -DUSE_STRM_INPUT $(INCS) -O2 $(NOCYGWIN) -fcommon
# LDFLAGS = -lwinmm
# LDFLAGS = -lwinmm
CFLAGS ?=
CFLAGS += $(CCXXFLAGS)

8
zip/Makefile.am
View File

@ -10,8 +10,8 @@ AM_CFLAGS += -I$(top_srcdir) -I$(top_srcdir)/zip/zip -I$(top_srcdir)/zip/unzip -
AM_CXXFLAGS += -I$(top_srcdir) -I$(top_srcdir)/zip/zip -I$(top_srcdir)/zip/unzip -I$(top_srcdir)/lib -DUNIX -DDLL -DUSE_ZIPMAIN -DNO_OFF_T -DNO_CRYPT -DNO_LCHOWN -DNO_LCHMOD -DIZ_PWLEN=80 -Dinflate=inflate_boinc -Ddeflate=deflate_boinc -Dget_crc_table=get_crc_table_boinc -Dlongest_match=longest_match_boinc -Dinflate_codes=inflate_codes_boinc -Dcrc32=crc32_boinc
if OS_WIN32
AM_CFLAGS += -DFORCE_WIN32_OVER_UNIX
AM_CXXFLAGS += -DFORCE_WIN32_OVER_UNIX
AM_CFLAGS += -DFORCE_WIN32_OVER_UNIX -fcommon
AM_CXXFLAGS += -DFORCE_WIN32_OVER_UNIX -fcommon
endif
if INSTALL_HEADERS
@ -43,7 +43,7 @@ boinc_zip.cpp \
./zip/z_globals.c \
./zip/zip.c \
./zip/zipfile.c \
./zip/zipup.c
./zip/zipup.c
if OS_WIN32
libboinc_zip_sources += \
@ -52,7 +52,7 @@ libboinc_zip_sources += \
./zip/win32/win32_boinc.c \
./zip/win32/win32i64.c \
./zip/win32/z_nt.c \
./zip/win32/win32zip.c
./zip/win32/win32zip.c
else
libboinc_zip_sources += \
./unzip/unix/unix.c \