diff options
| author | Fred Hornsey <hornseyf@objectcomputing.com> | 2018-09-06 16:37:13 -0500 |
|---|---|---|
| committer | Fred Hornsey <hornseyf@objectcomputing.com> | 2018-09-06 16:37:13 -0500 |
| commit | 711b5d2afea0867a175a8800421ec4fcf0082c4e (patch) | |
| tree | c7c638ed36447ba75d0c16ee6eb6c5862e8b38a9 /config | |
| parent | daba5550796f649d79029a70311ce898acc7792b (diff) | |
| download | MPC-711b5d2afea0867a175a8800421ec4fcf0082c4e.tar.gz | |
qt5_core.mpb: s/QT5_DIR/QTDIR/g and simplify PIC
Diffstat (limited to 'config')
| -rw-r--r-- | config/qt5_core.mpb | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/config/qt5_core.mpb b/config/qt5_core.mpb index 94f31926..8eba360a 100644 --- a/config/qt5_core.mpb +++ b/config/qt5_core.mpb @@ -1,20 +1,17 @@ project { expand(QT5_INCDIR) { $QT5_INCDIR - $(QT5_DIR)/include + $(QTDIR)/include } requires += qt5 includes += $(QT5_INCDIR) - libpaths += $(QT5_DIR)/lib + libpaths += $(QTDIR)/lib libs += Qt5Core // On Linux at least, Qt5 by default requires position independent code - verbatim (make, macros) { - CPPFLAGS += -fPIC - } - verbatim (gnuace, macros) { - CPPFLAGS += -fPIC + specific (gnuace) { + CPPFLAGS += $(PIC) } specific (prop:microsoft) { @@ -25,7 +22,7 @@ project { } Define_Custom(UIC) { - command = $(QT5_DIR)/bin/uic + command = $(QTDIR)/bin/uic output_option = -o inputext = .ui pre_filename = ui_ @@ -35,7 +32,7 @@ project { Define_Custom(MOC) { automatic_in = 0 automatic_out = 0 - command = $(QT5_DIR)/bin/moc + command = $(QTDIR)/bin/moc output_option = -o pch_postrule = 1 inputext = .h @@ -44,7 +41,7 @@ project { } Define_Custom(QRC) { - command = $(QT5_DIR)/bin/rcc + command = $(QTDIR)/bin/rcc output_option = -o commandflags = -name <%input_noext%> pch_postrule = 1 |