X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile;h=0ebb8841098b3e956011b012dfce2cd2b71b044d;hb=5718299276a6966eddc2f3fb5948a6dd1bbdef90;hp=c2974556a87d42c8632d826620c8a9080e08d3a9;hpb=9db206dbd95e95d3ddddded6f71056448e690084;p=movit diff --git a/Makefile b/Makefile index c297455..0ebb884 100644 --- a/Makefile +++ b/Makefile @@ -37,8 +37,8 @@ LIB_OBJS += sandbox_effect.o # Default target: all: $(TESTS) demo -# Google Test. -GTEST_OBJS = gtest-all.o gtest_sdl_main.o +# Google Test and other test library functions. +TEST_OBJS = gtest-all.o gtest_sdl_main.o test_util.o gtest-all.o: $(GTEST_DIR)/src/gtest-all.cc $(CXX) -MMD $(CPPFLAGS) -I$(GTEST_DIR) $(CXXFLAGS) -c $< -o $@ @@ -46,8 +46,8 @@ gtest_sdl_main.o: gtest_sdl_main.cpp $(CXX) -MMD $(CPPFLAGS) -I$(GTEST_DIR) $(CXXFLAGS) -c $< -o $@ # Unit tests. -effect_chain_test: effect_chain_test.o $(GTEST_OBJS) libmovit.a - $(CXX) -o $@ effect_chain_test.o $(GTEST_OBJS) libmovit.a $(LDFLAGS) +effect_chain_test: effect_chain_test.o $(TEST_OBJS) libmovit.a + $(CXX) -o $@ effect_chain_test.o $(TEST_OBJS) libmovit.a $(LDFLAGS) OBJS=$(DEMO_OBJS) $(LIB_OBJS) $(GDEMO_OBJS)