From 8b71c6283f8202fb432a789d675046190948a57d Mon Sep 17 00:00:00 2001 From: Sacha Date: Tue, 22 Jul 2014 19:15:13 +1000 Subject: [PATCH] Qt: Use -fno-strict-aliasing, wrap ffmpeg link with -Bstatic/dynamic --- Qt/Settings.pri | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Qt/Settings.pri b/Qt/Settings.pri index 55e0609fce..dd3890c698 100644 --- a/Qt/Settings.pri +++ b/Qt/Settings.pri @@ -21,7 +21,7 @@ INCLUDEPATH += $$P/ffmpeg/$${PLATFORM_NAME}/$${PLATFORM_ARCH}/include !contains(CONFIG, staticlib) { QMAKE_LIBDIR += $$CONFIG_DIR $$P/ffmpeg/$${PLATFORM_NAME}/$${PLATFORM_ARCH}/lib/ - contains(DEFINES, USE_FFMPEG): LIBS += -lavformat -lavcodec -lavutil -lswresample -lswscale + contains(DEFINES, USE_FFMPEG): LIBS += -Wl,-Bstatic -lavformat -lavcodec -lavutil -lswresample -lswscale -Wl,-Bdynamic equals(PLATFORM_NAME, "linux"):arm|android: LIBS += -lEGL } @@ -48,7 +48,7 @@ win32-msvc* { else: QMAKE_CXXFLAGS += -std=c++11 QMAKE_CFLAGS_RELEASE ~= s/-O.*/ QMAKE_CXXFLAGS_RELEASE ~= s/-O.*/ - QMAKE_ALLFLAGS_RELEASE += -O3 -ffast-math + QMAKE_ALLFLAGS_RELEASE += -O3 -ffast-math -fno-strict-aliasing } contains(QT_CONFIG, opengles.) {