From 3e42aae5b0ddf551524cd32b456a1e5ddf9d0739 Mon Sep 17 00:00:00 2001
From: Sacha <xsacha@gmail.com>
Date: Mon, 18 Aug 2014 02:00:22 +1000
Subject: [PATCH] Fix Symbian build in Travis. Add a 'no_assets' option to Qt
 that allows building without pre-compiled assets inside the binary. GCC has
 issues with high memory usage when compiling the assets file, so this is used
 as a workaround for Travis.

---
 .travis.yml   | 2 +-
 Qt/PPSSPP.pro | 7 ++++---
 b.sh          | 7 ++-----
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dc2c9a8831..c7f40fb672 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -80,7 +80,7 @@ script:
       ./b.sh --release --no-package;
     fi
   - if [ "$PPSSPP_BUILD_TYPE" == "Symbian" ]; then
-      ./b.sh --debug --no-package;
+      QMAKE_ARGS="CONFIG+=no_assets" ./b.sh --debug --no-package;
     fi
 
 after_success:
diff --git a/Qt/PPSSPP.pro b/Qt/PPSSPP.pro
index 27b93d2b07..d7efc73e98 100644
--- a/Qt/PPSSPP.pro
+++ b/Qt/PPSSPP.pro
@@ -79,14 +79,15 @@ HEADERS += $$P/UI/*.h
 
 INCLUDEPATH += $$P $$P/Common $$P/native $$P/native/ext $$P/native/ext/glew
 
-mobile_platform: RESOURCES += $$P/Qt/assets.qrc
-else {
+mobile_platform {
+	!no_assets: RESOURCES += $$P/Qt/assets.qrc
+} else {
 	# TODO: Rewrite Debugger with same backend as Windows version
 	# Do not use .ui forms. Use Qt5 + C++11 features to minimise code
 	SOURCES += $$P/Qt/*.cpp $$P/Qt/Debugger/*.cpp
 	HEADERS += $$P/Qt/*.h $$P/Qt/Debugger/*.h
 	FORMS += $$P/Qt/Debugger/*.ui
-	RESOURCES += $$P/Qt/desktop_assets.qrc
+	!no_assets: RESOURCES += $$P/Qt/desktop_assets.qrc
 	INCLUDEPATH += $$P/Qt $$P/Qt/Debugger
 	
 	# Creating translations should be done by Qt, really
diff --git a/b.sh b/b.sh
index 223701c840..c4ccf75d1a 100755
--- a/b.sh
+++ b/b.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 CMAKE=1
-MAKE_JOBS=4
 # Check Blackberry NDK
 BB_OS=`cat ${QNX_TARGET}/etc/qversion 2>/dev/null`
 if [ ! -z "$BB_OS" ]; then
@@ -12,7 +11,7 @@ fi
 
 # Check Symbian NDK
 if [ ! -z "$EPOCROOT" ]; then
-	QMAKE_ARGS="-spec symbian-sbsv2"
+	QMAKE_ARGS="-spec symbian-sbsv2 ${QMAKE_ARGS}"
 	CMAKE=0
 	PACKAGE=1
 	MAKE_OPT="release-gcce ${MAKE_OPT}"
@@ -75,8 +74,6 @@ if [ ! -z "$TARGET_OS" ]; then
 	# HACK (doesn't like shadowed dir)
 	if [ "$TARGET_OS" == "Symbian" ]; then
 		BUILD_DIR="Qt"
-		# Temporarily limiting memory usage for automated builds.
-		MAKE_JOBS=2
 	fi
 else
 	echo "Building for native host."
@@ -99,7 +96,7 @@ else
 	qmake $QMAKE_ARGS ../Qt/PPSSPPQt.pro
 fi
 
-make -j$MAKE_JOBS $MAKE_OPT
+make -j4 $MAKE_OPT
 
 if [ "$PACKAGE" == "1" ]; then
 	if [ "$TARGET_OS" == "Blackberry" ]; then