This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit a62c2bdb621afae6850d7ca44f4389176dd62f76 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Dec 1 20:44:31 2022 +0100 {handle_mxe.sh,x2goclient.pro}: make mxe selectable via CONFIG option and prepare selector in x2goclient.pro. --- debian/changelog | 2 ++ handle_mxe.sh | 2 +- x2goclient.pro | 18 ++++++++++++------ 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index f4847d0..234b64b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -140,6 +140,8 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium - macbuild.sh: qmake never supported -config, it was always CONFIG(+)='something'. - config_linux_static.sh: also switch from -config to CONFIG+='...'. + - {handle_mxe.sh,x2goclient.pro}: make mxe selectable via CONFIG option + and prepare selector in x2goclient.pro. * debian/control: + Move to debian/control.in. * debian/control.in: diff --git a/handle_mxe.sh b/handle_mxe.sh index 2c88999..b40a500 100755 --- a/handle_mxe.sh +++ b/handle_mxe.sh @@ -59,7 +59,7 @@ if [ 'prepare' = "${mode}" ]; then "${mxe_path}/qt5/bin/lrelease" '../x2goclient.pro' # no special Makefile required as qmake will create that - "${mxe_path}/qt5/bin/qmake" '../x2goclient.pro' -config "${BUILD_CONFIG}" + "${mxe_path}/qt5/bin/qmake" '../x2goclient.pro' CONFIG+="${BUILD_CONFIG} mxe" popd else diff --git a/x2goclient.pro b/x2goclient.pro index 3d80ac2..f52fe6e 100644 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -157,18 +157,24 @@ unix { } } else:win32 { - # pkgconfig is... tricky on Windows. Additionally, libssh 0.7.x stopped - # distributing pkgconfig files on non-UNIX platforms, including Windows. - # We'll hardcode stuff here. Make sure that it's consistent with the - # libraries we use on Windows. - LIBS += -lssh + mxe { + } + else { + # pkgconfig is... tricky on Windows. Additionally, libssh 0.7.x stopped + # distributing pkgconfig files on non-UNIX platforms, including Windows. + # We'll hardcode stuff here. Make sure that it's consistent with the + # libraries we use on Windows. + LIBS += -lssh + } } else { # For backwards-compatibility. LIBS += -lssh -lssh_threads } -win32:LIBS += -lAdvAPI32 -lshell32 -lUser32 +win32:!mxe { + LIBS += -lAdvAPI32 -lshell32 -lUser32 +} RC_FILE = res/x2goclient.rc SOURCES += src/x2goclient.cpp -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git