[Scummvm-git-logs] scummvm master -> 9ff41967a04e54e5de6207b8c46442833857aadc

[csnover]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
9ff41967a0 BUILD: Fix PSP build of test runner


Commit: 9ff41967a04e54e5de6207b8c46442833857aadc
    https://github.com/scummvm/scummvm/commit/9ff41967a04e54e5de6207b8c46442833857aadc
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-01-15T18:32:07-06:00

Commit Message:
BUILD: Fix PSP build of test runner

Changed paths:
    configure
    test/module.mk


diff --git a/configure b/configure
index 8b7b86f..7eaf54a 100755
--- a/configure
+++ b/configure
@@ -2637,6 +2637,7 @@ case $_host_os in
 		append_var CXXFLAGS "-I$PSPSDK/include"
 		# FIXME: Why is the following in CXXFLAGS and not in DEFINES? Change or document this.
 		append_var CXXFLAGS "-D_PSP_FW_VERSION=150"
+		add_line_to_config_mk 'PSP = 1'
 		;;
 	solaris*)
 		append_var DEFINES "-DSOLARIS"
diff --git a/test/module.mk b/test/module.mk
index de2f94d8..607eacc 100644
--- a/test/module.mk
+++ b/test/module.mk
@@ -23,6 +23,12 @@ ifdef N64
 TEST_LDFLAGS := $(filter-out -mno-crt0,$(TEST_LDFLAGS))
 endif
 
+ifdef PSP
+TEST_LIBS += backends/platform/psp/memory.o \
+	backends/platform/psp/mp3.o \
+	backends/platform/psp/trace.o
+endif
+
 ifdef HAVE_GCC3
 # In test/common/str.h, we test a zero length format string. This causes GCC
 # to generate a warning which in turn poses a problem when building with -Werror.