diff options
| author | Kai Koehne <kai.koehne@digia.com> | 2014-01-08 14:12:17 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-17 12:08:24 +0100 |
| commit | 278152fffd57a14fd5e7eb17064d9a1a17b7d72c (patch) | |
| tree | b0eebfc91c8072290359ce28255b80cbc1bf0f9b /src/angle/src | |
| parent | e59b28e08e7212415726fe9cd1b394e92607f061 (diff) | |
Replace win32-g++ with mingw scope
Commit 773dd01 introduced a general mingw platform scope, which
is cleaner and more flexible than matching the spec name.
Change-Id: Ie3a9cb791a83f7c8a51bc4e23069190c452ab521
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/angle/src')
| -rw-r--r-- | src/angle/src/compiler/translator_common.pro | 2 | ||||
| -rw-r--r-- | src/angle/src/compiler/translator_hlsl.pro | 2 | ||||
| -rw-r--r-- | src/angle/src/libEGL/libEGL.pro | 2 | ||||
| -rw-r--r-- | src/angle/src/libGLESv2/libGLESv2.pro | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/angle/src/compiler/translator_common.pro b/src/angle/src/compiler/translator_common.pro index 5581c9dc58..c8f86d6b10 100644 --- a/src/angle/src/compiler/translator_common.pro +++ b/src/angle/src/compiler/translator_common.pro @@ -5,7 +5,7 @@ TARGET = $$qtLibraryTarget(translator_common) include(../config.pri) # Mingw 4.7 chokes on implicit move semantics, so disable C++11 here -win32-g++*: CONFIG -= c++11 +mingw: CONFIG -= c++11 INCLUDEPATH += \ $$ANGLE_DIR/src \ diff --git a/src/angle/src/compiler/translator_hlsl.pro b/src/angle/src/compiler/translator_hlsl.pro index 1c31cad297..f19d33a530 100644 --- a/src/angle/src/compiler/translator_hlsl.pro +++ b/src/angle/src/compiler/translator_hlsl.pro @@ -5,7 +5,7 @@ TARGET = $$qtLibraryTarget(translator_hlsl) include(../config.pri) # Mingw 4.7 chokes on implicit move semantics, so disable C++11 here -win32-g++*: CONFIG -= c++11 +mingw: CONFIG -= c++11 INCLUDEPATH += $$ANGLE_DIR/src \ $$ANGLE_DIR/include diff --git a/src/angle/src/libEGL/libEGL.pro b/src/angle/src/libEGL/libEGL.pro index b5854189f9..f51bc8ee83 100644 --- a/src/angle/src/libEGL/libEGL.pro +++ b/src/angle/src/libEGL/libEGL.pro @@ -27,7 +27,7 @@ SOURCES += \ !static { DEF_FILE = $$ANGLE_DIR/src/libEGL/$${TARGET}.def - win32-g++*:equals(QT_ARCH, i386): DEF_FILE = $$ANGLE_DIR/src/libEGL/$${TARGET}_mingw32.def + mingw:equals(QT_ARCH, i386): DEF_FILE = $$ANGLE_DIR/src/libEGL/$${TARGET}_mingw32.def } load(qt_installs) diff --git a/src/angle/src/libGLESv2/libGLESv2.pro b/src/angle/src/libGLESv2/libGLESv2.pro index 5b3a49ed56..75853e219e 100644 --- a/src/angle/src/libGLESv2/libGLESv2.pro +++ b/src/angle/src/libGLESv2/libGLESv2.pro @@ -158,7 +158,7 @@ angle_d3d11 { !static { DEF_FILE = $$ANGLE_DIR/src/libGLESv2/$${TARGET}.def - win32-g++*:equals(QT_ARCH, i386): DEF_FILE = $$ANGLE_DIR/src/libGLESv2/$${TARGET}_mingw32.def + mingw:equals(QT_ARCH, i386): DEF_FILE = $$ANGLE_DIR/src/libGLESv2/$${TARGET}_mingw32.def } float_converter.target = float_converter |