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

Fix condor app for ubuntu 22.04

This commit is contained in:
Tal Regev 2022-04-30 22:00:46 +03:00
parent 35ddac9813
commit 02d4519032
No known key found for this signature in database
GPG Key ID: A421558E0F87AC82
2 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mingw/ci_make_apps.sh
View File

@ -14,7 +14,7 @@ export CXX="x86_64-w64-mingw32-g++"
export CC="x86_64-w64-mingw32-gcc" export CC="x86_64-w64-mingw32-gcc"
# condor # condor
export MINGW_FLAGS="-Dflockfile=_lock_file -Dfunlockfile=_unlock_file" export MINGW_FLAGS="-Dflockfile=_lock_file -Dfunlockfile=_unlock_file"
export MINGW_CURL="-lcurl -lwinmm -lws2_32 -lpthread -lssl -lcrypto -lcrypt32 -lws2_32 -lzlib -ladvapi32 -lcrypt32" export CURL_EXTRA_LDFLAGS="-lcurl -lwinmm -lpthread -lssl -lcrypto -lws2_32 -lzlib -ladvapi32 -lcrypt32"
# wrapper # wrapper
export MINGW_WRAPPER_FLAGS="-DEINSTEINATHOME_CROSS_BUILD -DMINGW_WIN32 -DHAVE_STRCASECMP -D_WINDOWS -D_WIN32 -DWIN32 -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_MT -DBOINC -DNODB -D_CONSOLE -fexceptions" export MINGW_WRAPPER_FLAGS="-DEINSTEINATHOME_CROSS_BUILD -DMINGW_WIN32 -DHAVE_STRCASECMP -D_WINDOWS -D_WIN32 -DWIN32 -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_MT -DBOINC -DNODB -D_CONSOLE -fexceptions"
export MINGW_ZIP_FIX="../../zip/zip/__p___mb_cur_max.c" export MINGW_ZIP_FIX="../../zip/zip/__p___mb_cur_max.c"

28
samples/condor/Makefile
View File

@ -17,6 +17,28 @@ else
MAKEFILE_LDFLAGS = -lpthread MAKEFILE_LDFLAGS = -lpthread
endif endif
CXXFLAGS += \
-I$(BOINC_DIR) \
-I$(BOINC_SOURCE_API_DIR) \
-I$(BOINC_SOURCE_LIB_DIR) \
-I$(BOINC_SOURCE_ZIP_DIR) \
-I$(FREETYPE_DIR) \
-L$(BOINC_API_DIR) \
-L$(BOINC_LIB_DIR) \
-L$(BOINC_ZIP_DIR)
ifdef BUILD_WITH_VCPKG
BUILD_DIR = $(BOINC_DIR)/3rdParty/linux
VCPKG_DIR ?= $(BUILD_DIR)/vcpkg/installed/x64-linux
CXXFLAGS += \
-I$(VCPKG_DIR)/include \
-L$(VCPKG_DIR)/lib
CURL_EXTRA_LDFLAGS ?= -lz -ldl
endif
PROGS = boinc_gahp PROGS = boinc_gahp
all: $(PROGS) all: $(PROGS)
@ -29,6 +51,6 @@ distclean: clean
distclean-recursive: clean distclean-recursive: clean
boinc_gahp: boinc_gahp.cpp $(BOINC_SOURCE_LIB_DIR)/remote_submit.h $(BOINC_SOURCE_LIB_DIR)/remote_submit.cpp $(BOINC_DIR)/svn_version.h $(BOINC_DIR)/version.h boinc_gahp: boinc_gahp.cpp $(BOINC_SOURCE_LIB_DIR)/remote_submit.h $(BOINC_SOURCE_LIB_DIR)/remote_submit.cpp $(BOINC_DIR)/svn_version.h $(BOINC_DIR)/version.h
$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) $(MINGW_FLAGS) -g -O2 -I$(BOINC_DIR) -I$(BOINC_SOURCE_LIB_DIR) \ $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) $(MINGW_FLAGS) -g -O2 \
-I$(VCPKG_DIR)/include -o boinc_gahp boinc_gahp.cpp $(BOINC_SOURCE_LIB_DIR)/remote_submit.cpp \ -o boinc_gahp boinc_gahp.cpp $(BOINC_SOURCE_LIB_DIR)/remote_submit.cpp \
-L$(BOINC_LIB_DIR) -L$(VCPKG_DIR)/lib -lcurl $(MINGW_CURL) -lssl -lcrypto -lboinc $(MAKEFILE_LDFLAGS) $(STDCPPTC) -lcurl -lssl -lcrypto -lboinc $(CURL_EXTRA_LDFLAGS) $(MAKEFILE_LDFLAGS) $(STDCPPTC)