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

version update

Browse Source
This commit is contained in:
Joachim Schoeberl 2009-09-08 20:37:33 +00:00
parent 7d961851fb
commit e3104d36a6
6 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config.h.in
View File

@ -15,6 +15,9 @@
/* Define to 1 if you have the <limits.h> header file. */ /* Define to 1 if you have the <limits.h> header file. */
#undef HAVE_LIMITS_H #undef HAVE_LIMITS_H
/* Define to 1 if you have the `matherr' function. */
#undef HAVE_MATHERR
/* Define to 1 if you have the <memory.h> header file. */ /* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H #undef HAVE_MEMORY_H

17
configure.ac
View File

@ -1,4 +1,4 @@
AC_INIT([netgen],[4.9.10],[],[]) AC_INIT([netgen],[4.9.11-dev],[],[])
AM_INIT_AUTOMAKE([-Wall -Werror foreign]) AM_INIT_AUTOMAKE([-Wall -Werror foreign])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
@ -129,6 +129,11 @@ AC_CHECK_HEADER(pthread.h)
AC_CHECK_HEADER([togl.h]) AC_CHECK_HEADER([togl.h])
AC_CHECK_HEADER([GL/gl.h]) AC_CHECK_HEADER([GL/gl.h])
AC_CHECK_FUNCS([pow])
AC_CHECK_FUNCS([floor])
AC_CHECK_FUNCS([matherr])
AC_CHECK_HEADERS([limits.h])
AC_CHECK_LIB(pthread, pthread_create) AC_CHECK_LIB(pthread, pthread_create)
@ -166,13 +171,6 @@ esac
AC_SUBST(LIBGLU) AC_SUBST(LIBGLU)
AC_CHECK_FUNCS([pow])
AC_CHECK_FUNCS([floor])
AC_CHECK_HEADERS([limits.h])
AC_CONFIG_FILES(Makefile libsrc/Makefile libsrc/csg/Makefile AC_CONFIG_FILES(Makefile libsrc/Makefile libsrc/csg/Makefile
@ -183,7 +181,4 @@ libsrc/linalg/Makefile libsrc/meshing/Makefile libsrc/occ/Makefile
libsrc/visualization/Makefile ng/Makefile nglib/Makefile libsrc/visualization/Makefile ng/Makefile nglib/Makefile
tutorials/Makefile doc/Makefile windows/Makefile ) tutorials/Makefile doc/Makefile windows/Makefile )
AC_OUTPUT AC_OUTPUT

2
libsrc/include/mydefs.hpp
View File

@ -20,7 +20,7 @@
// in the configure/make phases, with the // in the configure/make phases, with the
// right version number // right version number
#ifdef WIN32 #ifdef WIN32
#define PACKAGE_VERSION "4.9.10" #define PACKAGE_VERSION "4.9.11-dev"
#endif #endif

7
ng/ng.tcl
View File

@ -5,9 +5,10 @@ if {[catch {package require Tix } result ]} {
puts "error : $result" puts "error : $result"
} }
# if {[catch {package require Togl } result ]} { # if {[catch {package require Togl 2.0 } result ]} {
# puts "cannot find package Togl 2.0" # puts "cannot find package Togl 2.0"
# puts "error : $result" # puts "error : $result"
# }

5
ng/ngappinit.cpp
View File

@ -54,10 +54,9 @@ using netgen::RegisterUserFormats;
* The following variable is a special hack that is needed in order for * The following variable is a special hack that is needed in order for
* Sun shared libraries to be used for Tcl. * Sun shared libraries to be used for Tcl.
*/ */
#if !defined(__WIN32__) && !defined(MAC_TCL)
// extern "C" int matherr(); // extern "C" int matherr();
int *tclDummyMathPtr = (int *) matherr; // int *tclDummyMathPtr = (int *) matherr;
#endif
extern "C" int Ng_ServerSocketManagerInit (int port); extern "C" int Ng_ServerSocketManagerInit (int port);
extern "C" int Ng_ServerSocketManagerRun (void); extern "C" int Ng_ServerSocketManagerRun (void);

7
ng/ngpkg.cpp
View File

@ -132,9 +132,14 @@ namespace netgen
#ifdef FFMPEG #ifdef FFMPEG
extern "C" { extern "C" {
/*
#include <ffmpeg/avcodec.h> #include <ffmpeg/avcodec.h>
#include <ffmpeg/avformat.h> #include <ffmpeg/avformat.h>
#include <ffmpeg/swscale.h> #include <ffmpeg/swscale.h>
*/
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
#include <libswscale/swscale.h>
} }
#endif #endif
@ -3478,11 +3483,11 @@ namespace netgen
context->flags |= CODEC_FLAG_PSNR; context->flags |= CODEC_FLAG_PSNR;
if( avcodec_open( context, codec ) < 0 ) { if( avcodec_open( context, codec ) < 0 ) {
cout << "can't open codec" << endl;
avcodec_close( context ); avcodec_close( context );
av_free( context ); av_free( context );
free_buffers( &buff ); free_buffers( &buff );
fclose( MPGfile ); fclose( MPGfile );
cout << "can't open codec" << endl;
return TCL_ERROR; return TCL_ERROR;
} }