From 547fdec7eff18804c93c394e5e93e354254969ba Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 5 Sep 2011 14:36:26 +0400 Subject: [PATCH 4/4] Fix DSO linking Signed-off-by: Peter Lemenkov --- client/Makefile.am | 2 +- configure.ac | 2 +- server/Makefile.am | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/Makefile.am b/client/Makefile.am index 88f84f3..92a6486 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -1,6 +1,6 @@ bin_PROGRAMS = vcmiclient -vcmiclient_LDADD = $(top_builddir)/lib/libvcmi.la @SDL_LIBS@ @FFMPEG_LIBS@ @BOOST_PROGRAM_OPTIONS_LIB@ +vcmiclient_LDADD = $(top_builddir)/lib/libvcmi.la @SDL_LIBS@ @FFMPEG_LIBS@ @BOOST_PROGRAM_OPTIONS_LIB@ -lrt vcmiclient_CXXFLAGS = @SDL_CXXFLAGS@ @FFMPEG_CXXFLAGS@ vcmiclient_LDFLAGS = -L$(top_builddir)/lib vcmiclient_SOURCES = \ diff --git a/configure.ac b/configure.ac index cd719e4..3f5010e 100644 --- a/configure.ac +++ b/configure.ac @@ -86,7 +86,7 @@ saved_CFLAGS=$CFLAGS FFMPEG_CXXFLAGS="" FFMPEG_LIBS= -LIBS="$LIBS `pkg-config --libs libavformat libswscale`" +LIBS="$LIBS `pkg-config --libs libavcodec libavformat libavutil libswscale`" CFLAGS="$CFLAGS `pkg-config --cflags libavformat libswscale`" AC_CHECK_LIB(avformat,av_open_input_file,,AC_MSG_ERROR([FFMpeg avformat library not found. Please install it.])) diff --git a/server/Makefile.am b/server/Makefile.am index f593da9..33c8241 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -1,6 +1,6 @@ bin_PROGRAMS = vcmiserver -vcmiserver_LDADD = $(top_builddir)/lib/libvcmi.la +vcmiserver_LDADD = $(top_builddir)/lib/libvcmi.la -lrt vcmiserver_CXXFLAGS = @SDL_CXXFLAGS@ vcmiserver_LDFLAGS = -L$(top_builddir)/lib vcmiserver_SOURCES = \ -- 1.7.6.4