Merge post-0.7.0 commits through 'c8250d8b8' into v0.7.2.

sdl_common.c has lost some commits in the restructuring and those
will need to be replayed over the restructured files for SDL1 and 2.

sc2/build/unix/build_functions

@@ -106,9 +106,10 @@ build_depend() {
 # $1 - additional arguments to pass to make (at the moment just
 #      an optional -j arg for parallel builds).
 build_compile() {
-	local CFLAGS LDFLAGS TARGET_FILE DEPEND_FILE OBJDIR
+	local CFLAGS CXXFLAGS LDFLAGS TARGET_FILE DEPEND_FILE OBJDIR
 
 	eval CFLAGS="\${${BUILD_PROJECT}_CFLAGS}"
+	eval CXXFLAGS="\${${BUILD_PROJECT}_CXXFLAGS}"
 	eval LDFLAGS="\${${BUILD_PROJECT}_LDFLAGS}"
 	eval OBJDIR=\""\$BUILD_WORK/\${${BUILD_PROJECT}_OBJS}"\"
 	eval TARGET_FILE=\""\$BUILD_WORK/\${${BUILD_PROJECT}_NAME}"\"
@@ -116,7 +117,7 @@ build_compile() {
 
 	eval "${TARGET}_pre_build"
 
-	CFLAGS=$CFLAGS LDFLAGS=$LDFLAGS \
+	CFLAGS=$CFLAGS CXXFLAGS=$CXXFLAGS LDFLAGS=$LDFLAGS \
 			OBJDIR=$OBJDIR \
 			BUILD_ROOT= \
 			TARGET_FILE=$TARGET_FILE DEPEND_FILE=$DEPEND_FILE \
@@ -133,6 +134,7 @@ build_clean() {
 
 	eval DEPEND_FILE="\$BUILD_WORK/\${${BUILD_PROJECT}_OBJS}${DEPEND_NAME}"
 	rm -f "$DEPEND_FILE" "$BUILD_WORK/build.vars" \
+			"$BUILD_WORK/uqm-wrapper" \
 			"$BUILD_WORK/config.state"
 	eval "${TARGET}_clean"
 }