diff options
| author | Fred Hornsey <hornseyf@objectcomputing.com> | 2018-08-31 13:03:40 -0500 |
|---|---|---|
| committer | Fred Hornsey <hornseyf@objectcomputing.com> | 2018-08-31 13:03:40 -0500 |
| commit | 63755dc43b9dc20eda18b0eefda01ef0ca6f60b8 (patch) | |
| tree | ab5f6c412e33277bb13d2cf977e9649d845aaef2 /config/qt5_core.mpb | |
| parent | 4a0186828ed51e22debfb1deacddd30f7cbbfae8 (diff) | |
| download | MPC-63755dc43b9dc20eda18b0eefda01ef0ca6f60b8.tar.gz | |
Responses to comments in PR #69
Diffstat (limited to 'config/qt5_core.mpb')
| -rw-r--r-- | config/qt5_core.mpb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/config/qt5_core.mpb b/config/qt5_core.mpb index ee930691..abb9a537 100644 --- a/config/qt5_core.mpb +++ b/config/qt5_core.mpb @@ -6,22 +6,22 @@ project { requires += qt5 includes += $(QT5_INCDIR) - libpaths += $(QT5_DIR)/lib $(QT5_DIR)/bin + libpaths += $(QT5_DIR)/lib lit_libs += Qt5Core + // On Linux at least, Qt5 by default requires position independent code verbatim (make, macros) { CPPFLAGS += -fPIC } - verbatim (gnuace, macros) { CPPFLAGS += -fPIC } specific (prop:windows) { // On Windows it's possible for Qt to include winsock.h through windows.h - // which will conflict with winsock2.h. This forces the preprocessor to skip - // winsock.h. - macros += _WINSOCKAPI_ + // which will conflict with winsock2.h. This makes windows.h not include + // winsock.h + macros += WIN32_LEAN_AND_MEAN } Define_Custom(UIC) { |