diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-04-04 18:08:01 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-04-04 18:09:33 +0200 |
| commit | 9419dfe8ee45d08f09c09d3cbece511d721546f0 (patch) | |
| tree | 1c4584099fc1efb8de30cc4526ce7ebafe8a8ce9 /src/angle/src/common/common.pri | |
| parent | 8b5aa7b6c40d70a7ec15b3ea485f28a142fb247c (diff) | |
| parent | 8675e1c5ee7d1209784a2320f1ae3f486b1eaae4 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h
src/plugins/platforms/xcb/qxcbwindow.cpp
Change-Id: Ic747c3c50e68c005b425e7a1ec2a90965527c8bd
Diffstat (limited to 'src/angle/src/common/common.pri')
| -rw-r--r-- | src/angle/src/common/common.pri | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/src/angle/src/common/common.pri b/src/angle/src/common/common.pri index 3da59c61e2..7305362d86 100644 --- a/src/angle/src/common/common.pri +++ b/src/angle/src/common/common.pri @@ -30,29 +30,11 @@ winrt|msvc { error("Cannot determine DirectX SDK location. Please set DXSDK_DIR environment variable.") } - DXINC_DIR = $${DX_DIR}Include - contains(QT_ARCH, x86_64) { - DXLIB_DIR = $${DX_DIR}Lib\\x64 - } else { - DXLIB_DIR = $${DX_DIR}Lib\\x86 - } - equals(QMAKE_TARGET.arch, x86_64) { FXC = \"$${DX_DIR}Utilities\\bin\\x64\\fxc.exe\" } else { FXC = \"$${DX_DIR}Utilities\\bin\\x86\\fxc.exe\" } - - msvc { - # Unfortunately MinGW cannot use the DirectX headers from the DX SDK because d3d11shader.h uses - # buffer annotation macros (eg: __out, __in) which are not defined in the MinGW copy of - # specstrings_strict.h - INCLUDEPATH += $$DXINC_DIR - - # Similarly we want the MinGW linker to use the import libraries shipped with the compiler - # instead of those from the SDK which cause a crash on startup. - LIBS_PRIVATE += -L$$DXLIB_DIR - } } static: DEFINES *= LIBGLESV2_EXPORT_H_ ANGLE_EXPORT= |