[Scummvm-git-logs] scummvm master -> 5d22cc438f4a8182c66a534efa92eae40dab508a

[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:
5d22cc438f BUILD: Fix N64 build of test runner


Commit: 5d22cc438f4a8182c66a534efa92eae40dab508a
    https://github.com/scummvm/scummvm/commit/5d22cc438f4a8182c66a534efa92eae40dab508a
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-01-15T13:49:33-06:00

Commit Message:
BUILD: Fix N64 build of test runner

Changed paths:
    configure
    test/module.mk


diff --git a/configure b/configure
index dc05460..8b7b86f 100755
--- a/configure
+++ b/configure
@@ -2603,6 +2603,7 @@ case $_host_os in
 		append_var DEFINES "-DDISABLE_NES_APU"
 		append_var DEFINES "-DDISABLE_SID"
 		append_var DEFINES "-DREDUCE_MEMORY_USAGE"
+		add_line_to_config_mk 'N64 = 1'
 		;;
 	ps2)
 		append_var CXXFLAGS "-G2"
diff --git a/test/module.mk b/test/module.mk
index c09849f..de2f94d8 100644
--- a/test/module.mk
+++ b/test/module.mk
@@ -19,6 +19,10 @@ TEST_CFLAGS  := $(CFLAGS) -I$(srcdir)/test/cxxtest
 TEST_LDFLAGS := $(LDFLAGS) $(LIBS)
 TEST_CXXFLAGS := $(filter-out -Wglobal-constructors,$(CXXFLAGS))
 
+ifdef N64
+TEST_LDFLAGS := $(filter-out -mno-crt0,$(TEST_LDFLAGS))
+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.