[Scummvm-git-logs] scummvm master -> 48ea5cb459f333d19b53f22001814b7203aa4bd1

sev- sev at scummvm.org
Wed Dec 28 00:08:38 CET 2016


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

Summary:
6687d9c1ab TEST: Only build Wintermute tests when that engine is enabled
48ea5cb459 Merge pull request #876 from csnover/fix-test


Commit: 6687d9c1ab6b08237322e3bc48eb22efb018d01b
    https://github.com/scummvm/scummvm/commit/6687d9c1ab6b08237322e3bc48eb22efb018d01b
Author: Colin Snover (github.com at zetafleet.com)
Date: 2016-12-27T12:30:24-06:00

Commit Message:
TEST: Only build Wintermute tests when that engine is enabled

Changed paths:
    test/module.mk


diff --git a/test/module.mk b/test/module.mk
index da469b4..04e7dee 100644
--- a/test/module.mk
+++ b/test/module.mk
@@ -5,8 +5,13 @@
 #
 ######################################################################
 
-TESTS        := $(srcdir)/test/common/*.h $(srcdir)/test/audio/*.h $(srcdir)/test/engines/wintermute/*.h
-TEST_LIBS    := audio/libaudio.a common/libcommon.a engines/wintermute/libwintermute.a
+TESTS        := $(srcdir)/test/common/*.h $(srcdir)/test/audio/*.h
+TEST_LIBS    := audio/libaudio.a common/libcommon.a
+
+ifdef ENABLE_WINTERMUTE
+	TESTS += $(srcdir)/test/engines/wintermute/*.h
+	TEST_LIBS += engines/wintermute/libwintermute.a
+endif
 
 #
 TEST_FLAGS   := --runner=StdioPrinter --no-std --no-eh --include=$(srcdir)/test/cxxtest_mingw.h


Commit: 48ea5cb459f333d19b53f22001814b7203aa4bd1
    https://github.com/scummvm/scummvm/commit/48ea5cb459f333d19b53f22001814b7203aa4bd1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-12-28T00:08:33+01:00

Commit Message:
Merge pull request #876 from csnover/fix-test

TEST: Only build Wintermute tests when that engine is enabled

Changed paths:
    test/module.mk







More information about the Scummvm-git-logs mailing list