Commit c3c15164 authored by Adrien Béraud's avatar Adrien Béraud

build: link/include with ffmpeg

Gitlab: #54
Change-Id: Ieedfde12a0c9602f8ce664ef99b7205e9899751a
parent 9f285534
......@@ -89,7 +89,7 @@ case "${host_os}" in
CPPFLAGS+="-D_WIN32_WINNT=0x0601 -DWINVER=0x0601 -D__USE_MINGW_ANSI_STDIO=1"
LDFLAGS+="-Wl,--nxcompat -Wl,--dynamicbase"
LIBS+=" -lws2_32"
LIBS+=" -lws2_32 -lwsock32 -lshlwapi"
ac_default_prefix="`pwd`/_win32"
DESTDIR="`pwd`/_win32/"
AC_SUBST(WINDOWS_ARCH)
......
......@@ -60,6 +60,13 @@ libring_la_LDFLAGS = \
@ZLIB_LIBS@ \
@LIBSSL_LIBS@ \
@LIBCRYPTO_LIBS@ \
@LIBAVCODEC_LIBS@ \
@LIBAVFORMAT_LIBS@ \
@LIBAVDEVICE_LIBS@ \
@LIBAVFILTER_LIBS@ \
@LIBSWRESAMPLE_LIBS@ \
@LIBSWSCALE_LIBS@ \
@LIBAVUTIL_LIBS@ \
@LIBS@
if HAVE_WIN32
......@@ -79,7 +86,14 @@ libring_la_CFLAGS = \
@SPEEXDSP_CFLAGS@ \
@PORTAUDIO_CFLAGS@ \
@GNUTLS_CFLAGS@ \
@OPENDHT_CFLAGS@
@OPENDHT_CFLAGS@ \
@LIBAVCODEC_CFLAGS@
@LIBAVFORMAT_CFLAGS@ \
@LIBAVUTIL_CFLAGS@ \
@LIBAVDEVICE_CFLAGS@ \
@LIBAVFILTER_CFLAGS@ \
@LIBSWRESAMPLE_CFLAGS@ \
@LIBSWSCALE_CFLAGS@
libring_la_CXXFLAGS = @JSONCPP_CFLAGS@
......
......@@ -54,13 +54,3 @@ if ENABLE_VIDEO
libmedia_la_libADD = \
./video/libvideo.la
endif
libmedia_la_LDFLAGS = @LIBAVCODEC_LIBS@ @LIBAVFORMAT_LIBS@ @LIBAVDEVICE_LIBS@ @LIBAVFILTER_LIBS@ @LIBSWRESAMPLE_LIBS@ @LIBSWSCALE_LIBS@ @LIBAVUTIL_LIBS@
if HAVE_WIN32
libmedia_la_LDFLAGS += -lws2_32 -lwsock32 -lshlwapi
endif
AM_CFLAGS=@LIBAVCODEC_CFLAGS@ @LIBAVFORMAT_CFLAGS@ @LIBAVDEVICE_CFLAGS@ @LIBAVFILTER_CFLAGS@ @LIBSWRESAMPLE_CFLAGS@ @LIBSWSCALE_CFLAGS@
AM_CXXFLAGS=@LIBAVCODEC_CFLAGS@ @LIBAVFORMAT_CFLAGS@ @LIBAVDEVICE_CFLAGS@ @LIBAVFILTER_CFLAGS@ @LIBSWRESAMPLE_CFLAGS@ @LIBSWSCALE_CFLAGS@
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment