aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xconfigure1
-rw-r--r--test/module.mk4
2 files changed, 5 insertions, 0 deletions
diff --git a/configure b/configure
index dc054607d3..8b7b86f958 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 c09849f1c6..de2f94d8c6 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.