[Scummvm-git-logs] scummvm master -> 595770368c99d433d9d5729580a5cce5338f9af5

sev- sev at scummvm.org
Mon Jan 23 21:07:36 CET 2017


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:
595770368c TESTS: Attempt to fix Makefile for NDS build


Commit: 595770368c99d433d9d5729580a5cce5338f9af5
    https://github.com/scummvm/scummvm/commit/595770368c99d433d9d5729580a5cce5338f9af5
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-01-23T21:07:08+01:00

Commit Message:
TESTS: Attempt to fix Makefile for NDS build

Changed paths:
    test/module.mk


diff --git a/test/module.mk b/test/module.mk
index 75c96d8..9af652d 100644
--- a/test/module.mk
+++ b/test/module.mk
@@ -43,11 +43,13 @@ endif
 
 test: test/runner
 	./test/runner
-test/runner: test/runner.cpp $(TEST_LIBS)
+test/runner: test/runner.o $(TEST_LIBS)
 	$(QUIET_LINK)$(LD) $(TEST_CXXFLAGS) $(CPPFLAGS) $(TEST_CFLAGS) -o $@ $+ $(TEST_LDFLAGS)
 test/runner.cpp: $(TESTS)
 	@mkdir -p test
 	$(srcdir)/test/cxxtest/cxxtestgen.py $(TEST_FLAGS) -o $@ $+
+test/runner.o: test/runner.cpp
+	$(CXX) $(TEST_CXXFLAGS) $(CPPFLAGS) $(TEST_CFLAGS) -c $(<) -o $@
 
 
 clean: clean-test





More information about the Scummvm-git-logs mailing list