games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-15 20:03:15 +02:00
Code Issues Releases Activity

(linux) configure fixes.

Browse Source
This commit is contained in:
Frank Zago
2011-06-09 23:41:52 +00:00
parent 671e7bc3ec
commit bf9f0beb01
2 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
configure vendored
View File

@@ -16075,9 +16075,8 @@ as_fn_error $? "sdl-config doesn't exist. Try to check the PATH enviroment." "$L
fi fi
SDL_CXXFLAGS="`sdl-config --cflags`" SDL_CXXFLAGS="`sdl-config --cflags`"
SDL_LIBS="`sdl-config --libs`" LIBS="$LIBS `sdl-config --libs`"
LIBS="$LIBS $SDL_LIBS"
CFLAGS="$CFLAGS $SDL_CXXFLAGS" CFLAGS="$CFLAGS $SDL_CXXFLAGS"
@@ -16274,6 +16273,8 @@ else
fi fi
SDL_LIBS="$LIBS"
LIBS=$saved_LIBS LIBS=$saved_LIBS
CFLAGS=$saved_CFLAGS CFLAGS=$saved_CFLAGS
@@ -16281,11 +16282,11 @@ CFLAGS=$saved_CFLAGS
saved_LIBS=$LIBS saved_LIBS=$LIBS
saved_CFLAGS=$CFLAGS saved_CFLAGS=$CFLAGS
FFMPEG_CXXFLAGS="`pkg-config --cflags libavformat libswscale` $AVCODEC_DECODE_VIDEO2" FFMPEG_CXXFLAGS=""
FFMPEG_LIBS=`pkg-config --libs libavformat libswscale` FFMPEG_LIBS=
LIBS="$LIBS $FFMPEG_LIBS" LIBS="$LIBS `pkg-config --libs libavformat libswscale`"
CFLAGS="$CFLAGS $FFMPEG_CXXFLAGS" CFLAGS="$CFLAGS `pkg-config --cflags libavformat libswscale` $AVCODEC_DECODE_VIDEO2"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for av_open_input_file in -lavformat" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for av_open_input_file in -lavformat" >&5
$as_echo_n "checking for av_open_input_file in -lavformat... " >&6; } $as_echo_n "checking for av_open_input_file in -lavformat... " >&6; }
@@ -16422,6 +16423,9 @@ if test "x$ac_cv_lib_avcodec_avcodec_decode_video2" = x""yes; then :
fi fi
FFMPEG_LIBS="$LIBS"
FFMPEG_CXXFLAGS="$CFLAGS"
LIBS=$saved_LIBS LIBS=$saved_LIBS
CFLAGS=$saved_CFLAGS CFLAGS=$saved_CFLAGS

16
configure.ac
View File

@@ -63,9 +63,8 @@ AC_MSG_ERROR(sdl-config doesn't exist. Try to check the PATH enviroment.)
fi fi
SDL_CXXFLAGS="`sdl-config --cflags`" SDL_CXXFLAGS="`sdl-config --cflags`"
SDL_LIBS="`sdl-config --libs`" LIBS="$LIBS `sdl-config --libs`"
LIBS="$LIBS $SDL_LIBS"
CFLAGS="$CFLAGS $SDL_CXXFLAGS" CFLAGS="$CFLAGS $SDL_CXXFLAGS"
AC_CHECK_HEADERS([SDL/SDL.h SDL/SDL_mixer.h SDL/SDL_image.h SDL/SDL_ttf.h], [], [AC_MSG_ERROR([Header not found. Install missing devel package.])]) AC_CHECK_HEADERS([SDL/SDL.h SDL/SDL_mixer.h SDL/SDL_image.h SDL/SDL_ttf.h], [], [AC_MSG_ERROR([Header not found. Install missing devel package.])])
@@ -75,6 +74,8 @@ AC_CHECK_LIB(SDL_mixer,main,,AC_MSG_ERROR([SDL_mixer library not found. Please i
AC_CHECK_LIB(SDL_image,IMG_Load,,AC_MSG_ERROR([SDL_image library not found. Please install it.])) AC_CHECK_LIB(SDL_image,IMG_Load,,AC_MSG_ERROR([SDL_image library not found. Please install it.]))
AC_CHECK_LIB(SDL_ttf,main,,AC_MSG_ERROR([SDL_ttf library not found. Please install it.])) AC_CHECK_LIB(SDL_ttf,main,,AC_MSG_ERROR([SDL_ttf library not found. Please install it.]))
SDL_LIBS="$LIBS"
LIBS=$saved_LIBS LIBS=$saved_LIBS
CFLAGS=$saved_CFLAGS CFLAGS=$saved_CFLAGS
@@ -82,16 +83,19 @@ CFLAGS=$saved_CFLAGS
saved_LIBS=$LIBS saved_LIBS=$LIBS
saved_CFLAGS=$CFLAGS saved_CFLAGS=$CFLAGS
FFMPEG_CXXFLAGS="`pkg-config --cflags libavformat libswscale` $AVCODEC_DECODE_VIDEO2" FFMPEG_CXXFLAGS=""
FFMPEG_LIBS=`pkg-config --libs libavformat libswscale` FFMPEG_LIBS=
LIBS="$LIBS $FFMPEG_LIBS" LIBS="$LIBS `pkg-config --libs libavformat libswscale`"
CFLAGS="$CFLAGS $FFMPEG_CXXFLAGS" CFLAGS="$CFLAGS `pkg-config --cflags libavformat libswscale` $AVCODEC_DECODE_VIDEO2"
AC_CHECK_LIB(avformat,av_open_input_file,,AC_MSG_ERROR([FFMpeg avformat library not found. Please install it.])) AC_CHECK_LIB(avformat,av_open_input_file,,AC_MSG_ERROR([FFMpeg avformat library not found. Please install it.]))
AC_CHECK_LIB(swscale,sws_getContext,,AC_MSG_ERROR([FFMpeg swscale library not found. Please install it.])) AC_CHECK_LIB(swscale,sws_getContext,,AC_MSG_ERROR([FFMpeg swscale library not found. Please install it.]))
AC_CHECK_LIB(avcodec,avcodec_decode_video2,AVCODEC_DECODE_VIDEO2="-DWITH_AVCODEC_DECODE_VIDEO2",) AC_CHECK_LIB(avcodec,avcodec_decode_video2,AVCODEC_DECODE_VIDEO2="-DWITH_AVCODEC_DECODE_VIDEO2",)
FFMPEG_LIBS="$LIBS"
FFMPEG_CXXFLAGS="$CFLAGS"
LIBS=$saved_LIBS LIBS=$saved_LIBS
CFLAGS=$saved_CFLAGS CFLAGS=$saved_CFLAGS