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

Add mingw apps_gui

This commit is contained in:
Tal Regev 2021-08-16 08:04:27 +00:00
parent ef4aca7e54
commit 03011e8f30
No known key found for this signature in database
GPG Key ID: A421558E0F87AC82
10 changed files with 44 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,6 +31,22 @@ jobs:
if: success() && matrix.type == 'apps-mingw'
run: cd lib && MINGW=x86_64-w64-mingw32 make -f Makefile.mingw wrapper
- name: Install Powershell for vcpkg
if: success() && matrix.type == 'apps-mingw-vcpkg'
run: |
POWERSHELL_DEPS="wget apt-transport-https software-properties-common"
# Install pre-requisite packages of PowerShell
sudo apt install -y $POWERSHELL_DEPS doxygen
# Download the Microsoft repository GPG keys
VERSION=$(lsb_release -r -s)
wget -q https://packages.microsoft.com/config/ubuntu/$VERSION/packages-microsoft-prod.deb
# Register the Microsoft repository GPG keys
sudo dpkg -i packages-microsoft-prod.deb
# Update the list of packages after we added packages.microsoft.com
sudo apt update
# Install PowerShell
sudo apt install -y powershell
- name: Automake vcpkg apps
if: success() && matrix.type == 'apps-mingw-vcpkg'
run: ./_autosetup

2
api/Makefile.am
View File

@ -101,7 +101,7 @@ $(LIBBOINC_OPENCL_STATIC): libboinc_opencl.la
$(LN) .libs/$(LIBBOINC_OPENCL_STATIC) .
clean:
rm -f ${LIBBOINC_API_STATIC} ${LIBBOINC_GRAPHICS2_STATIC} ${LIBBOINC_OPENCL_STATIC}
rm -f ${LIBBOINC_API_STATIC} ${LIBBOINC_GRAPHICS2_STATIC} ${LIBBOINC_OPENCL_STATIC} *.a *.o *.lo *.la
endif ## ENABLE_LIBRARIES

2
deploy/prepare_deployment.py
View File

@ -54,6 +54,8 @@ mingw_apps_vcpkg_list = [
'./samples/condor/boinc_gahp.exe',
'./samples/example_app/uc2.exe',
'./samples/example_app/ucn.exe',
'./samples/example_app/uc2_graphics.exe',
'./samples/example_app/slide_show.exe',
'./samples/multi_thread/multi_thread.exe',
'./samples/sleeper/sleeper.exe',
'./samples/worker/worker.exe',

2
lib/Makefile.am
View File

@ -249,7 +249,7 @@ $(LIBBOINC_FCGI_STATIC): libboinc_fcgi.la
$(LN) .libs/$(LIBBOINC_FCGI_STATIC) .
clean: clean-am
rm -f $(LIBBOINC_STATIC) $(LIBBOINC_CRYPT_STATIC) $(LIBBOINC_FCGI_STATIC) *.gcno *.gcda *.gcov
rm -f $(LIBBOINC_STATIC) $(LIBBOINC_CRYPT_STATIC) $(LIBBOINC_FCGI_STATIC) *.gcno *.gcda *.gcov *.a *.o *.lo *.la
endif
# end of "if ENABLE_LIBRARIES"

2
mingw/ci_configure_apps.sh
View File

@ -20,4 +20,4 @@ export CXXFLAGS="$ZIP_VCPROJ_FLAGS $ZIP_BOINC_RENAMES $ZIP_MINGW -I$VCPKG_DIR/in
export CFLAGS="$CXXFLAGS"
export _libcurl_pc="$VCPKG_DIR/lib/pkgconfig/libcurl.pc"
./configure --host=x86_64-w64-mingw32 --with-libcurl=$VCPKG_DIR --with-ssl=$VCPKG_DIR --enable-apps --enable-apps-mingw --enable-apps-vcpkg --disable-server --disable-client --disable-manager
./configure --host=x86_64-w64-mingw32 --with-libcurl=$VCPKG_DIR --with-ssl=$VCPKG_DIR --enable-apps --enable-apps-mingw --enable-apps-vcpkg --enable-apps-gui --disable-server --disable-client --disable-manager

3
mingw/ci_make_apps.sh
View File

@ -24,4 +24,7 @@ if [ ! -f $VCPKG_DIR/lib/libz.a ]; then
ln -s $VCPKG_DIR/lib/libzlib.a $VCPKG_DIR/lib/libz.a
fi
export CXXFLAGS="-I$VCPKG_DIR/include -L$VCPKG_DIR/lib"
export CFLAGS="$CXXFLAGS"
make

2
mingw/update_vcpkg.sh
View File

@ -20,5 +20,5 @@ fi
git -C $VCPKG_ROOT pull
$VCPKG_ROOT/bootstrap-vcpkg.sh
$VCPKG_ROOT/vcpkg install rappture curl[core,openssl] --triplet=x64-mingw-static --clean-after-build --overlay-triplets=$VCPKG_PORTS/triplets/ci
$VCPKG_ROOT/vcpkg install curl[core,openssl] rappture ftgl freeglut libjpeg-turbo --triplet=x64-mingw-static --clean-after-build --overlay-triplets=$VCPKG_PORTS/triplets/ci
$VCPKG_ROOT/vcpkg upgrade --no-dry-run

4
samples/Makefile.am
View File

@ -2,6 +2,10 @@
include $(top_srcdir)/Makefile.incl
if BUILD_WITH_MINGW
export BUILD_WITH_MINGW="yes"
endif
if BUILD_WITH_GUI
export BUILD_WITH_GUI="yes"
endif

16
samples/example_app/Makefile
View File

@ -42,8 +42,19 @@ CXXFLAGS += -g \
LIBGLUT = -lglut
LIBGLU = -lGLU
LIBGL= -lGL
LIBUI = -lX11 -lXmu
LIBFTGL = -lftgl
LIBJPEG = -ljpeg
ifdef BUILD_WITH_MINGW
LIBGLUT = -lfreeglut_static
LIBGLU = -lglu32
LIBGL= -lopengl32
LIBUI = -lgdi32 -lwinmm
LIBFTGL = -lftgl -lfreetype -lpng -lbz2 -lbrotlidec-static -lbrotlienc-static -lbrotlicommon-static -lz
endif
PROGS = uc2 ucn
# make this optional so compile doesn't break on systems without OpenGL
GUI_PROGS = uc2_graphics slide_show
@ -91,13 +102,14 @@ uc2_graphics: uc2_graphics.o ttfont.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(
$(BOINC_API_DIR)/libboinc_api.a \
$(BOINC_LIB_DIR)/libboinc.a \
$(LIBGLUT) $(LIBGLU) $(LIBJPEG) \
-lftgl -lGL -lX11 -lXmu -lm
$(LIBFTGL) $(LIBGL) $(LIBUI) -lm
slide_show: slide_show.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_graphics2.a
$(CXX) $(CXXFLAGS) -o slide_show slide_show.o libstdc++.a -pthread \
$(MINGW_ZIP_FIX) \
$(BOINC_API_DIR)/libboinc_graphics2.a \
$(BOINC_API_DIR)/libboinc_api.a \
$(BOINC_LIB_DIR)/libboinc.a \
$(BOINC_ZIP_DIR)/libboinc_zip.a \
$(LIBGLUT) $(LIBGLU) $(LIBJPEG) \
-lGL -lX11 -lXmu -lm
$(LIBGL) $(LIBUI) -lm

2
zip/Makefile.am
View File

@ -82,4 +82,4 @@ $(LIBBOINC_ZIP_STATIC): libboinc_zip.la
$(LN) .libs/$(LIBBOINC_ZIP_STATIC) .
clean:
rm -f $(LIBBOINC_ZIP_STATIC)
rm -f $(LIBBOINC_ZIP_STATIC) *.a *.o *.lo *.la