summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorFred Hornsey <hornseyf@objectcomputing.com>2018-09-10 14:45:14 -0500
committerFred Hornsey <hornseyf@objectcomputing.com>2018-09-10 14:45:14 -0500
commitf8ebb0f283d301681226bbba2f574a9b45661938 (patch)
tree6c9ef2350b9d5f00490e1e1a384b78d7b524ee17 /config
parent5a491945405b7d745ce7274eea1a57d194332979 (diff)
downloadMPC-f8ebb0f283d301681226bbba2f574a9b45661938.tar.gz
Qt5: Optional bin and lib variables
Diffstat (limited to 'config')
-rw-r--r--config/qt5_core.mpb16
1 files changed, 12 insertions, 4 deletions
diff --git a/config/qt5_core.mpb b/config/qt5_core.mpb
index 3fa0ed40..7e7306af 100644
--- a/config/qt5_core.mpb
+++ b/config/qt5_core.mpb
@@ -3,10 +3,18 @@ project {
$QT5_INCDIR
$(QTDIR)/include
}
+ expand(QT5_BINDIR) {
+ $QT5_BINDIR
+ $(QTDIR)/bin
+ }
+ expand(QT5_LIBDIR) {
+ $QT5_LIBDIR
+ $(QTDIR)/lib
+ }
requires += qt5
includes += $(QT5_INCDIR)
- libpaths += $(QTDIR)/lib
+ libpaths += $(QT5_LIBDIR)
libs += Qt5Core
// On Linux at least, Qt5 by default requires position independent code
@@ -22,7 +30,7 @@ project {
}
Define_Custom(UIC) {
- command = $(QTDIR)/bin/uic
+ command = $(QT5_BINDIR)/uic
output_option = -o
inputext = .ui
pre_filename = ui_
@@ -32,7 +40,7 @@ project {
Define_Custom(MOC) {
automatic_in = 0
automatic_out = 0
- command = $(QTDIR)/bin/moc
+ command = $(QT5_BINDIR)/moc
output_option = -o
pch_postrule = 1
inputext = .h
@@ -41,7 +49,7 @@ project {
}
Define_Custom(QRC) {
- command = $(QTDIR)/bin/rcc
+ command = $(QT5_BINDIR)/rcc
output_option = -o
commandflags = -name <%input_noext%>
pch_postrule = 1