diff options
| author | Fred Hornsey <fred@hornsey.us> | 2018-08-30 16:29:08 -0500 |
|---|---|---|
| committer | Fred Hornsey <fred@hornsey.us> | 2018-08-30 16:29:08 -0500 |
| commit | 4a0186828ed51e22debfb1deacddd30f7cbbfae8 (patch) | |
| tree | 41b47ff0d770edb136b58f3950db2294aba1c050 /config | |
| parent | 6c74af62f66f4097e624220d8e01de771de461ca (diff) | |
| download | MPC-4a0186828ed51e22debfb1deacddd30f7cbbfae8.tar.gz | |
Avoid Winsock 1 Header when using Qt5
Diffstat (limited to 'config')
| -rw-r--r-- | config/qt5_core.mpb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/config/qt5_core.mpb b/config/qt5_core.mpb index 08425abe..ee930691 100644 --- a/config/qt5_core.mpb +++ b/config/qt5_core.mpb @@ -6,7 +6,7 @@ project { requires += qt5 includes += $(QT5_INCDIR) - libpaths += $(QT5_DIR)/lib + libpaths += $(QT5_DIR)/lib $(QT5_DIR)/bin lit_libs += Qt5Core verbatim (make, macros) { @@ -17,6 +17,13 @@ project { 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_ + } + Define_Custom(UIC) { command = $(QT5_DIR)/bin/uic output_option = -o |