summaryrefslogtreecommitdiffstats
path: root/rbutil/rbutilqt/rbutilqt.pro
diff options
context:
space:
mode:
authorFranklin Wei <franklin@rockbox.org>2019-11-09 20:52:08 -0500
committerFranklin Wei <franklin@rockbox.org>2019-11-09 20:54:57 -0500
commita5f228eee2240c3d12f0d03b51adad5603cb10d3 (patch)
treeb1f514917f817ef973dc1aa935ff7b5979f2099b /rbutil/rbutilqt/rbutilqt.pro
parent1925d043a2d98caacc669ded319a7e1fcd197ef8 (diff)
downloadrockbox-a5f228eee2240c3d12f0d03b51adad5603cb10d3.tar.gz
rockbox-a5f228eee2240c3d12f0d03b51adad5603cb10d3.tar.bz2
rockbox-a5f228eee2240c3d12f0d03b51adad5603cb10d3.zip
rbutil: fix windows cross compile (via M cross environment)
This fixes a couple of issues when cross-compiling for windows: - lib builds (i.e. mks5lboot) were overriding the cross CC/CXX with the native CC, producing incompatible binaries. - Qt made the accessibility plugin part of the core library, so we no longer need to import it. Change-Id: I9d884aee62dfa51d3624a3fa9b99c23b3b375f20
Diffstat (limited to 'rbutil/rbutilqt/rbutilqt.pro')
-rw-r--r--rbutil/rbutilqt/rbutilqt.pro7
1 files changed, 5 insertions, 2 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro
index cfd6fb39ab..43d74e59d7 100644
--- a/rbutil/rbutilqt/rbutilqt.pro
+++ b/rbutil/rbutilqt/rbutilqt.pro
@@ -32,6 +32,7 @@ unix:!mac:!noccache {
}
MACHINEFLAGS = $$find(QMAKE_CFLAGS, -m[63][42])
EXTRALIBS_OPTS += EXTRALIBS_CC=\"$$QMAKE_CC\"
+EXTRALIBS_OPTS += EXTRALIBS_CXX=\"$$QMAKE_CXX\"
EXTRALIBS_OPTS += EXTRALIB_CFLAGS=\"$$MACHINEFLAGS\" \
MYBUILDDIR = $$OUT_PWD/build/
@@ -251,8 +252,10 @@ macx {
}
static {
- QTPLUGIN += qtaccessiblewidgets
- LIBS += -L$$(QT_BUILD_TREE)/plugins/accessible -lqtaccessiblewidgets
+ if(equals(QT_MAJOR_VERSION, 5) : lessThan(QT_MINOR_VERSION, 4)) | lessThan(QT_MAJOR_VERSION, 5) {
+ QTPLUGIN += qtaccessiblewidgets
+ LIBS += -L$$(QT_BUILD_TREE)/plugins/accessible -lqtaccessiblewidgets
+ }
LIBS += -L.
DEFINES += STATIC
message("using static plugin")