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

Set webkit2gtk-4.0 ldflags only for wxwidgets vcpkg manager.

This commit is contained in:
Tal Regev 2022-06-17 22:53:58 +03:00
parent 1a087d81a6
commit 200ba69cf4
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
linux/ci_configure_manager.sh
View File

@ -14,4 +14,4 @@ export VCPKG_DIR="$VCPKG_ROOT/installed/x64-linux"
linux/update_vcpkg_manager.sh linux/update_vcpkg_manager.sh
export _libcurl_pc="$VCPKG_DIR/lib/pkgconfig/libcurl.pc" export _libcurl_pc="$VCPKG_DIR/lib/pkgconfig/libcurl.pc"
./configure --enable-vcpkg --disable-server --disable-client --with-wx-config=$VCPKG_DIR/tools/wxwidgets/wx-config CPPFLAGS=-DwxDEBUG_LEVEL=0 ./configure --enable-vcpkg --disable-server --disable-client --with-wx-config=$VCPKG_DIR/tools/wxwidgets/wx-config CPPFLAGS=-DwxDEBUG_LEVEL=0 GTK_LIBS="`pkg-config --libs gtk+-3.0 webkit2gtk-4.0`"

4
m4/boinc_wxwidgets.m4
View File

@ -84,7 +84,9 @@ WARNING: No ${uprf} libraries for wxWidgets are installed.
;; ;;
esac esac
GTK_CFLAGS="`pkg-config --cflags $gtkver`" GTK_CFLAGS="`pkg-config --cflags $gtkver`"
GTK_LIBS="`pkg-config --libs $gtkver webkit2gtk-4.0`" if test "x$GTK_LIBS" = "x" ; then
GTK_LIBS="`pkg-config --libs $gtkver`"
fi
fi fi
AC_SUBST([GTK_CFLAGS]) AC_SUBST([GTK_CFLAGS])
AC_SUBST([GTK_LIBS]) AC_SUBST([GTK_LIBS])