From 8f22fbee51e01a1e3af27d18f2cb4fbbf4cd2f98 Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Tue, 26 Jan 2016 16:38:35 +0100
Subject: [PATCH] Add --quicktime switch to build with media_plugin_quicktime
 and enable it for ReleaseFS (Windows only).

---
 autobuild.xml                  |  1 +
 scripts/configure_firestorm.sh | 20 +++++++++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 50097d635a..7bff8c3a7e 100755
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -3486,6 +3486,7 @@
                 <array>
                   <string>--fmodex</string>
                   <string>--kdu</string>
+                  <string>--quicktime</string>
                   <string>--version</string>
                   <string>--platform win32</string>
                 </array>
diff --git a/scripts/configure_firestorm.sh b/scripts/configure_firestorm.sh
index 94400bb4e0..ccb1a8ff97 100755
--- a/scripts/configure_firestorm.sh
+++ b/scripts/configure_firestorm.sh
@@ -33,6 +33,7 @@ WANTS_PACKAGE=$FALSE
 WANTS_VERSION=$FALSE
 WANTS_KDU=$FALSE
 WANTS_FMODEX=$FALSE
+WANTS_QUICKTIME=$FALSE
 WANTS_OPENSIM=$TRUE
 WANTS_AVX=$FALSE
 WANTS_BUILD=$FALSE
@@ -63,7 +64,7 @@ showUsage()
     echo "  --package    : Build installer"
     echo "  --no-package : Build without installer (Overrides --package)"
     echo "  --fmodex     : Build with FMOD Ex"
-    echo "  --leapmotion : Build with Leap Motion Controller support"
+    echo "  --quicktime  : Build with Quicktime (Windows)"
     echo "  --opensim    : Build with OpenSim support (Disables Havok features)"
     echo "  --no-opensim : Build without OpenSim support (Overrides --opensim)"
     echo "  --avx        : Build with Advanced Vector Extensions"
@@ -78,7 +79,7 @@ getArgs()
 # $* = the options passed in from main
 {
     if [ $# -gt 0 ]; then
-      while getoptex "clean build config version package no-package fmodex ninja jobs: platform: kdu leapmotion opensim no-opensim avx help chan: btype:" "$@" ; do
+      while getoptex "clean build config version package no-package fmodex ninja jobs: platform: kdu quicktime opensim no-opensim avx help chan: btype:" "$@" ; do
 
           #insure options are valid
           if [  -z "$OPTOPT"  ] ; then
@@ -97,6 +98,7 @@ getArgs()
                       ;;
           kdu)        WANTS_KDU=$TRUE;;
           fmodex)     WANTS_FMODEX=$TRUE;;
+          quicktime)  WANTS_QUICKTIME=$TRUE;;
           opensim)    WANTS_OPENSIM=$TRUE;;
           no-opensim) WANTS_OPENSIM=$FALSE;;
           avx)        WANTS_AVX=$TRUE;;
@@ -273,6 +275,7 @@ echo -e "configure_firestorm.py" > $LOG
 echo -e "    PLATFORM: '$PLATFORM'"          | tee -a $LOG
 echo -e "         KDU: `b2a $WANTS_KDU`"     | tee -a $LOG
 echo -e "      FMODEX: `b2a $WANTS_FMODEX`"  | tee -a $LOG
+echo -e "   Quicktime: `b2a $WANTS_QUICKTIME`" | tee -a $LOG
 echo -e "     OPENSIM: `b2a $WANTS_OPENSIM`" | tee -a $LOG
 echo -e "         AVX: `b2a $WANTS_AVX` "    | tee -a $LOG
 echo -e "     PACKAGE: `b2a $WANTS_PACKAGE`" | tee -a $LOG
@@ -370,6 +373,17 @@ if [ $WANTS_CONFIG -eq $TRUE ] ; then
     else
         FMODEX="-DFMODEX:BOOL=OFF"
     fi
+	
+    if [ $PLATFORM == "win32" ] ; then
+      if [ $WANTS_QUICKTIME -eq $TRUE ] ; then
+          QUICKTIME="-DHAVE_QUICKTIME_3P:BOOL=ON"
+      else
+          QUICKTIME="-DHAVE_QUICKTIME_3P:BOOL=OFF"
+      fi
+	else
+		QUICKTIME=""
+	fi
+	
     if [ $WANTS_OPENSIM -eq $TRUE ] ; then
         OPENSIM="-DOPENSIM:BOOL=ON"
     else
@@ -435,7 +449,7 @@ if [ $WANTS_CONFIG -eq $TRUE ] ; then
         UNATTENDED="-DUNATTENDED=ON"
     fi
 
-    cmake -G "$TARGET" ../indra $CHANNEL $FMODEX $KDU $OPENSIM $AVX_OPTIMIZATION $PACKAGE $UNATTENDED -DLL_TESTS:BOOL=OFF -DWORD_SIZE:STRING=$WORD_SIZE -DCMAKE_BUILD_TYPE:STRING=$BTYPE \
+    cmake -G "$TARGET" ../indra $CHANNEL $FMODEX $QUICKTIME $KDU $OPENSIM $AVX_OPTIMIZATION $PACKAGE $UNATTENDED -DLL_TESTS:BOOL=OFF -DWORD_SIZE:STRING=$WORD_SIZE -DCMAKE_BUILD_TYPE:STRING=$BTYPE \
           -DNDTARGET_ARCH:STRING="${TARGET_ARCH}" -DROOT_PROJECT_NAME:STRING=Firestorm $LL_ARGS_PASSTHRU | tee $LOG
 
     if [ $PLATFORM == "win32" ] ; then