Fixes to build procedure for speech output.

Manual override through DISABLE_SPEECH now works on all platforms.

QGCExternalLibs.pri

@@ -517,37 +517,32 @@ MacBuild {
 }
 
 ##
-# Speech synthesis library support.
+# [OPTIONAL] Speech synthesis library support.
 # Can be forcibly disabled by adding a `DEFINES+=DISABLE_SPEECH` argument to qmake.
+# Linux support requires the Festival Lite speech synthesis engine (flite).
+# Mac support is provided in Snow Leopard and newer (10.6+)
+# Windows is supported as of Windows 7
 #
-
-# Festival Lite speech synthesis engine
-LinuxBuild {
-	contains (DEFINES, DISABLE_SPEECH) {
-		message("Skipping support for speech synthesis (manual override)")
-	} else:exists(/usr/include/flite) | exists(/usr/local/include/flite) {
-		message(Enabling support for speech output)
+contains (DEFINES, DISABLE_SPEECH) {
+	message("Skipping support for speech output (manual override)")
+} else:LinuxBuild {
+	exists(/usr/include/flite) | exists(/usr/local/include/flite) {
+		message("Including support for speech output")
 		LIBS += \
-			-lflite_cmu_us_kal \
-			-lflite_usenglish \
-			-lflite_cmulex \
-			-lflite
+		-lflite_cmu_us_kal \
+		-lflite_usenglish \
+		-lflite_cmulex \
+		-lflite
 	} else {
 		DEFINES += DISABLE_SPEECH
-		warning("Skipping support for speech synthesis (missing flite libraries, see README)")
+		warning("Skipping support for speech output (missing libraries, see README)")
 	}
 }
-
-# Mac support for speech synthesis is currently broken.
-# Library support is built into Mac OS X
-MacBuild {
-	message("Including support for speech synthesis.")
+# Mac support is built into OS 10.6+.
+else:MacBuild {
+	message("Including support for speech output")
 }
-
-# Windows support for speech synthesis is currently broken
-# Library support is built into Windows
-WindowsBuild {
-	DEFINES += DISABLE_SPEECH
-	message("Skipping support for speech synthesis (unsupported on Windows)")
+# Windows supports speech through native API.
+else:WindowsBuild {
+	message("Including support for speech output")
 }
-

README.md

@@ -48,7 +48,7 @@ Integration with Opal-RT's RT-LAB simulator can be enabled on Windows by install
 This support is enabled by default once the requisite RT-LAB software is installed. Disabling this can be done by defining DISABLE_RTLAB when running qmake.
 
 ### Speech syntehsis
-QGroundcontrol can notify the controller of information via speech synthesis on the Mac and Linux platforms. This requires the `flite` library on Linux while on Mac text-to-speech support is built in starting with OS 10.6+ (Snow Leopard). This support is enabled by default on all platforms if the dependencies are met. Disabling this functionality can be done by adding the `DISABLE_SPEECH` define when running `qmake` like: `qmake DEFINES=DISABLE_SPEECH`. Note that multiple defines can be specified like this: `qmake DEFINES="DISABLE_QUPGRADE DISABLE_SPEECH"`.
+QGroundcontrol can notify the controller of information via speech synthesis. This requires the `flite` library on Linux. On Mac and Windows support is built in to the OS as of OS X 10.6 (Snow Leopard) and Windows Vista. This support is enabled by default on all platforms if the dependencies are met. Disabling this functionality can be done by adding the `DISABLE_SPEECH` define when running `qmake` like: `qmake DEFINES=DISABLE_SPEECH`. Note that multiple defines can be specified like this: `qmake DEFINES="DISABLE_QUPGRADE DISABLE_SPEECH"`.
 
 ### 3D view
 The OpenSceneGraph libraries provide 3D rendering to the map overlays that QGC can provide.