mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Get cross build to work again

Browse source 
...and re-enable silent mode by default for cross builds

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2013-10-11 13:25:37 -07:00
parent 4a213bba41
commit 35952a59d0
2 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
packaging/windows/mingw-make.sh
View file

@ -3,17 +3,13 @@
# just a small shell script that is used to invoke make with the right # just a small shell script that is used to invoke make with the right
# parameters to cross compile a binary for Windows # parameters to cross compile a binary for Windows
# #
# the paths work for the default mingw32 install on OpenSUSE - adjust as # the paths work for the default mingw32 install on Fedora - adjust as
# necessary # necessary
# force recreation of the nsi file in order to get the correct version # force recreation of the nsi file in order to get the correct version
# number # number
rm packaging/windows/subsurface.nsi rm packaging/windows/subsurface.nsi > /dev/null 2>&1
export PATH=/usr/i686-w64-mingw32/sys-root/mingw/bin:$PATH export PATH=/usr/i686-w64-mingw32/sys-root/mingw/bin:$PATH
make CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ \ mingw32-qmake-qt4 CROSS_PATH=/usr/i686-w64-mingw32/sys-root/mingw
PKGCONFIG=i686-w64-mingw32-pkg-config \ mingw32-make $@
PKG_CONFIG_PATH=/usr/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig/ \
CROSS_PATH=/usr/i686-w64-mingw32/sys-root/mingw/ \
XSLTCONFIG=/usr/i686-w64-mingw32/sys-root/mingw/bin/xslt-config \
XML2CONFIG=/usr/i686-w64-mingw32/sys-root/mingw/bin/xml2-config install-cross-windows $@

19
subsurface-configure.pri
View file

@ -26,9 +26,10 @@ CONFIG -= warn_on warn_off
CONFIG += exceptions_off CONFIG += exceptions_off
# Check if we have pkg-config # Check if we have pkg-config
isEmpty(PKG_CONFIG):PKG_CONFIG=pkg-config
equals($$QMAKE_HOST.os, "Windows"):NUL=NUL equals($$QMAKE_HOST.os, "Windows"):NUL=NUL
else:NUL=/dev/null else:NUL=/dev/null
PKG_CONFIG_OUT = $$system(pkg-config --version 2> $$NUL) PKG_CONFIG_OUT = $$system($$PKG_CONFIG --version 2> $$NUL)
!isEmpty(PKG_CONFIG_OUT) { !isEmpty(PKG_CONFIG_OUT) {
CONFIG += link_pkgconfig CONFIG += link_pkgconfig
} else { } else {
@ -43,6 +44,8 @@ PKG_CONFIG_OUT = $$system(pkg-config --version 2> $$NUL)
INCLUDEPATH += ../libdivecomputer/include INCLUDEPATH += ../libdivecomputer/include
LIBS += ../libdivecomputer/src/.libs/libdivecomputer.a LIBS += ../libdivecomputer/src/.libs/libdivecomputer.a
LIBDC_LA = ../libdivecomputer/src/libdivecomputer.la LIBDC_LA = ../libdivecomputer/src/libdivecomputer.la
} else:!isEmpty(CROSS_PATH):exists($${CROSS_PATH}"/lib/libdivecomputer.a"):exists($${CROSS_PATH}"/lib/libusb-1.0.a") {
LIBS += $${CROSS_PATH}"/lib/libdivecomputer.a" $${CROSS_PATH}"/lib/libusb-1.0.a"
} else:exists(/usr/local/lib/libdivecomputer.a) { } else:exists(/usr/local/lib/libdivecomputer.a) {
LIBS += /usr/local/lib/libdivecomputer.a LIBS += /usr/local/lib/libdivecomputer.a
LIBDC_LA = /usr/local/lib/libdivecomputer.la LIBDC_LA = /usr/local/lib/libdivecomputer.la
@ -52,8 +55,8 @@ PKG_CONFIG_OUT = $$system(pkg-config --version 2> $$NUL)
} else:link_pkgconfig { } else:link_pkgconfig {
# find it via pkg-config, but we need to pass the --static flag, # find it via pkg-config, but we need to pass the --static flag,
# so we can't use the PKGCONFIG variable. # so we can't use the PKGCONFIG variable.
LIBS += $$system("pkg-config --static --libs libdivecomputer") LIBS += $$system($$PKG_CONFIG --static --libs libdivecomputer)
LIBDC_CFLAGS = $$system("pkg-config --static --cflags libdivecomputer") LIBDC_CFLAGS = $$system($$PKG_CONFIG --static --cflags libdivecomputer)
QMAKE_CFLAGS += $$LIBDC_CFLAGS QMAKE_CFLAGS += $$LIBDC_CFLAGS
QMAKE_CXXFLAGS += $$LIBDC_CFLAGS QMAKE_CXXFLAGS += $$LIBDC_CFLAGS
unset(LIBDC_CFLAGS) unset(LIBDC_CFLAGS)
@ -79,12 +82,12 @@ XSLT_LIBS = $$system(xslt-config --libs 2>$$NUL)
link_pkgconfig { link_pkgconfig {
isEmpty(XML2_CFLAGS)|isEmpty(XML2_LIBS) { isEmpty(XML2_CFLAGS)|isEmpty(XML2_LIBS) {
XML2_CFLAGS = $$system(pkg-config --cflags libxml2 2> $$NUL) XML2_CFLAGS = $$system($$PKG_CONFIG --cflags libxml2 2> $$NUL)
XML2_LIBS = $$system(pkg-config --libs libxml2 2> $$NUL) XML2_LIBS = $$system($$PKG_CONFIG --libs libxml2 2> $$NUL)
} }
isEmpty(XSLT_CFLAGS)|isEmpty(XSLT_LIBS) { isEmpty(XSLT_CFLAGS)|isEmpty(XSLT_LIBS) {
XSLT_CFLAGS = $$system(pkg-config --cflags libxslt 2> $$NUL) XSLT_CFLAGS = $$system($$PKG_CONFIG --cflags libxslt 2> $$NUL)
XSLT_LIBS = $$system(pkg-config --libs libxslt 2> $$NUL) XSLT_LIBS = $$system($$PKG_CONFIG --libs libxslt 2> $$NUL)
} }
isEmpty(XML2_CFLAGS)|isEmpty(XML2_LIBS): \ isEmpty(XML2_CFLAGS)|isEmpty(XML2_LIBS): \
error("Could not find libxml2. Did you forget to install it?") error("Could not find libxml2. Did you forget to install it?")
@ -126,7 +129,7 @@ win32 {
# #
# misc # misc
# #
!equals(V, 1): !win32: CONFIG += silent !equals(V, 1): !equals($$QMAKE_HOST.os, "Windows"): CONFIG += silent
MOC_DIR = .moc MOC_DIR = .moc
UI_DIR = .uic UI_DIR = .uic
RCC_DIR = .rcc RCC_DIR = .rcc