Skip to content

Commit

Permalink
Do not link libmovit against SDL; only the unit tests need that.
Browse files Browse the repository at this point in the history
  • Loading branch information
sesse committed Mar 16, 2014
1 parent ca8568e commit ca67cec
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ with_coverage = @with_coverage@
CC=@CC@
CXX=@CXX@
CXXFLAGS=-Wall @CXXFLAGS@ -I$(GTEST_DIR)/include @Eigen3_CFLAGS@ @GLEW_CFLAGS@ @FFTW3_CFLAGS@
LDFLAGS=@GLEW_LIBS@ @SDL_LIBS@ @FFTW3_LIBS@ -lpthread
LDFLAGS=@GLEW_LIBS@ @FFTW3_LIBS@ -lpthread
TEST_LDLIBS=@SDL_LIBS@
DEMO_LDLIBS=@SDL_image_LIBS@ -lrt -lpthread @libpng_LIBS@ @FFTW3_LIBS@
SHELL=@SHELL@
LIBTOOL=@LIBTOOL@ --tag=CXX
Expand Down Expand Up @@ -101,7 +102,7 @@ gtest_sdl_main.o: gtest_sdl_main.cpp

# Unit tests.
$(TESTS): %: %.o $(TEST_OBJS) libmovit.la
$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $^ $(LDLIBS)
$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $^ $(LDLIBS) $(TEST_LDLIBS)

OWN_OBJS=$(DEMO_OBJS) $(LIB_OBJS) $(OWN_TEST_OBJS) $(TESTS:=.o)
OBJS=$(DEMO_OBJS) $(LIB_OBJS) $(TEST_OBJS) $(TESTS:=.o)
Expand Down

0 comments on commit ca67cec

Please sign in to comment.