summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorOliver Wolff <oliver.wolff@theqtcompany.com>2016-03-21 13:19:17 +0100
committerOliver Wolff <oliver.wolff@theqtcompany.com>2016-04-06 05:54:10 +0000
commit6a85b950a4af63c8f5213bd04d5e779213edfe81 (patch)
tree66acfc9209a4ff15914739d123a36304ee94a405 /src
parent1726352207273465c12852d027f97b99884b78e4 (diff)
ANGLE: Do not use march=native
That configuration causes gcc to create non portable code and thus should not be used. Task-number: QTBUG-51938 Change-Id: Ib134bd0b12811c15805943180c41af8f411e6453 Reviewed-by: Andrew Knight <andrew.knight@intopalo.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r--src/angle/src/config.pri2
-rw-r--r--src/angle/src/libGLESv2/libGLESv2.pro2
2 files changed, 1 insertions, 3 deletions
diff --git a/src/angle/src/config.pri b/src/angle/src/config.pri
index fddb395ab2..2c5b5ec615 100644
--- a/src/angle/src/config.pri
+++ b/src/angle/src/config.pri
@@ -97,8 +97,6 @@ gcc {
-Wno-strict-aliasing -Wno-type-limits -Wno-unused-local-typedefs
QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -Wno-reorder -Wno-conversion-null -Wno-delete-non-virtual-dtor
-
- sse2: QMAKE_CXXFLAGS += -march=native
}
QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG
diff --git a/src/angle/src/libGLESv2/libGLESv2.pro b/src/angle/src/libGLESv2/libGLESv2.pro
index 1da079fd40..c90f3d326e 100644
--- a/src/angle/src/libGLESv2/libGLESv2.pro
+++ b/src/angle/src/libGLESv2/libGLESv2.pro
@@ -205,7 +205,6 @@ SOURCES += \
$$ANGLE_DIR/src/libANGLE/renderer/d3d/IndexBuffer.cpp \
$$ANGLE_DIR/src/libANGLE/renderer/d3d/IndexDataManager.cpp \
$$ANGLE_DIR/src/libANGLE/renderer/d3d/loadimage.cpp \
- $$ANGLE_DIR/src/libANGLE/renderer/d3d/loadimageSSE2.cpp \
$$ANGLE_DIR/src/libANGLE/renderer/d3d/ProgramD3D.cpp \
$$ANGLE_DIR/src/libANGLE/renderer/d3d/RenderbufferD3D.cpp \
$$ANGLE_DIR/src/libANGLE/renderer/d3d/RendererD3D.cpp \
@@ -227,6 +226,7 @@ SOURCES += \
$$ANGLE_DIR/src/libGLESv2/global_state.cpp \
$$ANGLE_DIR/src/libGLESv2/libGLESv2.cpp
+SSE2_SOURCES += $$ANGLE_DIR/src/libANGLE/renderer/d3d/loadimageSSE2.cpp
angle_d3d11 {
HEADERS += \