cleanup build script

Author: ReplayCoding

build.sh

@@ -82,57 +82,38 @@ if [[ -n ${CHROOT_NAME} ]]; then
 	fi
 fi
 
-if [[ ! -f "thirdparty/protobuf-2.6.1/src/.libs/libprotobuf.a" ]]; then
-	pushd .
-	cd "thirdparty/protobuf-2.6.1/"
-	if [[ -n ${CHROOT_NAME} ]]; then
-		schroot --chroot "${CHROOT_NAME}" -- /bin/bash << EOF
-			export PATH=/bin:/usr/bin
-			export CC="$CC"
-			export CXX="$CXX"
-			autoreconf
-			chmod u+x configure
-			./configure "CFLAGS=-m32 -Wno-reserved-user-defined-literal -D_GLIBCXX_USE_CXX11_ABI=0 ${CF_SUPPRESSION}" \
-				"CXXFLAGS=-m32 -Wno-reserved-user-defined-literal -D_GLIBCXX_USE_CXX11_ABI=0 ${CF_SUPPRESSION}" \
-				"LDFLAGS=-m32"
-			make "-j$CORES"
+build_thirdparty() {
+  if [[ ! -f "thirdparty/$1/src/.libs/$2" ]]; then
+    pushd .
+    cd "thirdparty/$1/"
+    local EXTRA_CFLAGS=$3
+    local CFLAGS="-m32 -Wno-reserved-user-defined-literal -D_GLIBCXX_USE_CXX11_ABI=0 ${EXTRA_CFLAGS} ${CF_SUPPRESSION}"
+    if [[ -n ${CHROOT_NAME} ]]; then
+      schroot --chroot "${CHROOT_NAME}" -- /bin/bash << EOF
+        export PATH=/bin:/usr/bin
+        export CC="$CC"
+        export CXX="$CXX"
+        autoreconf -i
+        chmod u+x configure
+        ./configure "CFLAGS=${CFLAGS}" \
+          "CXXFLAGS=${CFLAGS}" \
+          "LDFLAGS=-m32"
+        make "-j$CORES"
 EOF
-	else
-		autoreconf
-		chmod u+x configure
-		./configure "CFLAGS=-m32 -Wno-reserved-user-defined-literal -D_GLIBCXX_USE_CXX11_ABI=0 ${CF_SUPPRESSION}" \
-			"CXXFLAGS=-m32 -Wno-reserved-user-defined-literal -D_GLIBCXX_USE_CXX11_ABI=0 ${CF_SUPPRESSION}" \
-			"LDFLAGS=-m32"
-		make "-j$CORES"
-	fi
-	popd
-fi
+    else
+      autoreconf -i 
+      chmod u+x configure
+      ./configure "CFLAGS=${CFLAGS}" \
+        "CXXFLAGS=${CFLAGS}" \
+        "LDFLAGS=-m32"
+      make "-j$CORES"
+    fi
+    popd
+  fi
+}
 
-if [[ ! -f "thirdparty/libedit-3.1/src/.libs/libedit.a" ]]; then
-	pushd .
-	cd "thirdparty/libedit-3.1/"
-	if [[ -n ${CHROOT_NAME} ]]; then
-		schroot --chroot "${CHROOT_NAME}" -- /bin/bash << EOF
-			export PATH=/bin:/usr/bin
-			export CC="$CC"
-			export CXX="$CXX"
-			autoreconf
-			chmod u+x configure
-			./configure "CFLAGS=-m32 -Wno-reserved-user-defined-literal -D_GLIBCXX_USE_CXX11_ABI=0 ${CF_SUPPRESSION}" \
-				"CXXFLAGS=-m32 -Wno-reserved-user-defined-literal -D_GLIBCXX_USE_CXX11_ABI=0 ${CF_SUPPRESSION}" \
-				"LDFLAGS=-m32"
-			make "-j$CORES"
-EOF
-	else
-		autoreconf
-		chmod u+x configure
-		./configure "CFLAGS=-m32 -Wno-reserved-user-defined-literal -D_GLIBCXX_USE_CXX11_ABI=0 ${CF_SUPPRESSION}" \
-			"CXXFLAGS=-m32 -Wno-reserved-user-defined-literal -D_GLIBCXX_USE_CXX11_ABI=0 ${CF_SUPPRESSION}" \
-			"LDFLAGS=-m32"
-		make "-j$CORES"
-	fi
-	popd
-fi
+build_thirdparty "protobuf-2.6.1" "libprotobuf.a"
+build_thirdparty "libedit-3.1" "libedit.a"
 
 if [[ ! -f "./devtools/bin/vpc_linux" ]]; then
 	pushd .
@@ -155,5 +136,5 @@ fi
 devtools/bin/vpc_linux /define:WORKSHOP_IMPORT_DISABLE /define:SIXENSE_DISABLE /define:NO_X360_XDK \
 				/define:RAD_TELEMETRY_DISABLED /define:DISABLE_ETW /retail /tf ${VPC_FLAGS} +game /mksln games
 
-time CFLAGS="${CF_SUPPRESSION}" CXXFLAGS="${CF_SUPPRESSION}" make ${MAKE_SRT_FLAGS} MAKE_VERBOSE="${MAKE_VERBOSE}" ${MAKE_CFG} \
+time CFLAGS="${CF_SUPPRESSION}" CXXFLAGS="${CF_SUPPRESSION}" make "${MAKE_SRT_FLAGS}" MAKE_VERBOSE="${MAKE_VERBOSE}" ${MAKE_CFG} \
 		MAKE_JOBS="$CORES" -f games.mak "$@"

src/thirdparty/protobuf-2.6.1/config.h.in

@@ -81,8 +81,7 @@
 /* Enable classes using zlib compression. */
 #undef HAVE_ZLIB
 
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
 #undef LT_OBJDIR
 
 /* Name of package */

src/thirdparty/protobuf-2.6.1/gtest/build-aux/config.h.in

@@ -33,8 +33,7 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
 #undef LT_OBJDIR
 
 /* Name of package */