diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2017-03-23 09:34:48 +0100 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@qt.io> | 2017-03-28 06:29:43 +0000 |
| commit | a6bbaa08bfb37a77afa9ee8077cd51f74dd9ee9c (patch) | |
| tree | 5fc802e904762c6d58411b5611980524ca1ffb05 /src | |
| parent | ed96363d56b912dc828537549a8028c8ad4ea3bb (diff) | |
ANGLE: remove dead MinGW code from common.pri
Change-Id: I09a9d0553f00a3b04d084300cb6e2b9f5211913e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src')
| -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= |