[Scummvm-cvs-logs] scummvm master -> 24579ceba9b219ab3a89f31b5496b2633e076af6

Littleboy littleboy22 at gmail.com
Thu Sep 8 01:48:28 CEST 2011


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:
24579ceba9 TEST: Allow building the test runner with MinGW


Commit: 24579ceba9b219ab3a89f31b5496b2633e076af6
    https://github.com/scummvm/scummvm/commit/24579ceba9b219ab3a89f31b5496b2633e076af6
Author: Littleboy (littleboy at scummvm.org)
Date: 2011-09-07T16:41:27-07:00

Commit Message:
TEST: Allow building the test runner with MinGW

It needs the same workaround as our dev tools (see bug #1800764)

Changed paths:
  A test/cxxtest_mingw.h
    test/module.mk



diff --git a/test/cxxtest_mingw.h b/test/cxxtest_mingw.h
new file mode 100644
index 0000000..f407105
--- /dev/null
+++ b/test/cxxtest_mingw.h
@@ -0,0 +1,11 @@
+
+#ifndef CXXTEST_MINGW
+#define CXXTEST_MINGW
+
+// HACK to allow building with the SDL backend on MinGW
+// see bug #1800764 "TOOLS: MinGW tools building broken"
+#ifdef main
+#undef main
+#endif // main
+
+#endif // CXXTEST_MINGW
\ No newline at end of file
diff --git a/test/module.mk b/test/module.mk
index 4e5cbf6..11ee6bd 100644
--- a/test/module.mk
+++ b/test/module.mk
@@ -9,7 +9,7 @@ TESTS        := $(srcdir)/test/common/*.h $(srcdir)/test/audio/*.h
 TEST_LIBS    := audio/libaudio.a common/libcommon.a
 
 #
-TEST_FLAGS   := --runner=StdioPrinter --no-std --no-eh
+TEST_FLAGS   := --runner=StdioPrinter --no-std --no-eh --include=$(srcdir)/test/cxxtest_mingw.h
 TEST_CFLAGS  := -I$(srcdir)/test/cxxtest
 TEST_LDFLAGS := $(LIBS)
 TEST_CXXFLAGS := $(filter-out -Wglobal-constructors,$(CXXFLAGS))






More information about the Scummvm-git-logs mailing list