ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-12-25 05:20:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
Joachim Schoeberl 2009-04-07 13:15:21 +00:00
parent 49c1f51839
commit 08ea2e9639
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure.ac
View File

@ -65,14 +65,16 @@ AC_ARG_ENABLE([parallel],
AC_ARG_ENABLE([jpeglib], AC_ARG_ENABLE([jpeglib],
[ --enable-jpeglib enable snapshots using jpeglib], [AS_HELP_STRING([--enable-jpeglib],[enable snapshots using library libjpeg])],
[AC_SUBST([JPEGLIB_INCLUDES], "-DJPEGLIB") [AC_SUBST([JPEGLIB_INCLUDES], "-DJPEGLIB")
AC_SUBST([JPEGLIB_LIBS], "-ljpeg") AC_CHECK_LIB(jpeg, jpeg_start_compress,
AC_SUBST([JPEGLIB_LIBS], "-ljpeg") ,
AC_MSG_ERROR([no usable library libjpeg found]))
] ]
) )
AC_ARG_ENABLE([ffmpeg], AC_ARG_ENABLE([ffmpeg],
[ --enable-ffmpeg enable video recording with FFmpeg, uses libavcodec], [AS_HELP_STRING([--enable-ffmpeg],[enable video recording with FFmpeg, uses libavcodec])],
[AC_SUBST([FFMPEG_INCLUDES], "-DFFMPEG") [AC_SUBST([FFMPEG_INCLUDES], "-DFFMPEG")
AC_SUBST([FFMPEG_LIBS], "-lavutil -lavformat -lavcodec -lavutil -lswscale -lz -lbz2") AC_SUBST([FFMPEG_LIBS], "-lavutil -lavformat -lavcodec -lavutil -lswscale -lz -lbz2")
] ]
@ -80,7 +82,6 @@ AC_ARG_ENABLE([ffmpeg],
# AC_HEADER_STDC # AC_HEADER_STDC
AC_CONFIG_HEADERS(config.h) AC_CONFIG_HEADERS(config.h)
AC_DISABLE_STATIC AC_DISABLE_STATIC
AC_LANG([C++]) AC_LANG([C++])

2
ng/ngpkg.cpp
View File

@ -3469,6 +3469,8 @@ namespace netgen
#ifdef FFMPEG #ifdef FFMPEG
// thanks to Mikko Lyly @ CSC, Helsinki
#define STATE_READY 0 #define STATE_READY 0
#define STATE_STARTED 1 #define STATE_STARTED 1