From b7982729b04468dd7c9b393120b2f37e0a886c37 Mon Sep 17 00:00:00 2001
From: Sacha <xsacha@gmail.com>
Date: Tue, 5 Aug 2014 16:59:57 +1000
Subject: [PATCH] Qt: Allow building with system ffmpeg. Also update b.sh to
 set cmake and qmake flags in case --qt is at the end of the arguments.

---
 Qt/Settings.pri |  6 ++----
 b.sh            | 17 +++++++----------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/Qt/Settings.pri b/Qt/Settings.pri
index 9e8137d64..b62bf6d78 100644
--- a/Qt/Settings.pri
+++ b/Qt/Settings.pri
@@ -19,13 +19,11 @@ include(Platform/ArchDetection.pri)
 # Work out platform name
 include(Platform/OSDetection.pri)
 # OS dependent paths
-INCLUDEPATH += $$P/ffmpeg/$${PLATFORM_NAME}/$${PLATFORM_ARCH}/include
+!system_ffmpeg: INCLUDEPATH += $$P/ffmpeg/$${PLATFORM_NAME}/$${PLATFORM_ARCH}/include
 
 !contains(CONFIG, staticlib) {
-	QMAKE_LIBDIR += $$CONFIG_DIR $$P/ffmpeg/$${PLATFORM_NAME}/$${PLATFORM_ARCH}/lib/
-	g++: LIBS += -Wl,-Bstatic
+	!system_ffmpeg: QMAKE_LIBDIR += $$CONFIG_DIR $$P/ffmpeg/$${PLATFORM_NAME}/$${PLATFORM_ARCH}/lib/
 	contains(DEFINES, USE_FFMPEG): LIBS+=  -lavformat -lavcodec -lavutil -lswresample -lswscale
-	g++: LIBS += -Wl,-Bdynamic
 	equals(PLATFORM_NAME, "linux"):arm|android: LIBS += -lEGL
 }
 
diff --git a/b.sh b/b.sh
index 290d86cf1..b9aba0cba 100755
--- a/b.sh
+++ b/b.sh
@@ -37,18 +37,15 @@ do
 			CMAKE_ARGS="-DSIMULATOR=ON ${CMAKE_ARGS}"
 			;;
 		--release)
-			if [ "$CMAKE" == "1" ]; then
-				CMAKE_ARGS="-DCMAKE_BUILD_TYPE=Release ${CMAKE_ARGS}"
-			else
-				QMAKE_ARGS="CONFIG+=release ${QMAKE_ARGS}"
-			fi
+			CMAKE_ARGS="-DCMAKE_BUILD_TYPE=Release ${CMAKE_ARGS}"
+			QMAKE_ARGS="CONFIG+=release ${QMAKE_ARGS}"
 			;;
 		--debug)
-			if [ "$CMAKE" == "1" ]; then
-				CMAKE_ARGS="-DCMAKE_BUILD_TYPE=Debug ${CMAKE_ARGS}"
-			else
-				QMAKE_ARGS="CONFIG+=debug ${QMAKE_ARGS}"
-			fi
+			CMAKE_ARGS="-DCMAKE_BUILD_TYPE=Debug ${CMAKE_ARGS}"
+			QMAKE_ARGS="CONFIG+=debug ${QMAKE_ARGS}"
+			;;
+		--system-ffmpeg)
+			QMAKE_ARGS="CONFIG+=system_ffmpeg ${QMAKE_ARGS}"
 			;;
 		--headless) echo "Headless mode enabled"
 			CMAKE_ARGS="-DHEADLESS=ON ${CMAKE_ARGS}"