Skip to content
Snippets Groups Projects
Commit 6fbf95bc authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

msh files should be opened in binary mode (on f&*%^ing Windows)
parent 3484b617
No related branches found
No related tags found
No related merge requests found
// $Id: GModelIO.cpp,v 1.28 2006-08-19 19:46:07 geuzaine Exp $
// $Id: GModelIO.cpp,v 1.29 2006-08-24 16:55:28 geuzaine Exp $
//
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
//
......@@ -309,7 +309,7 @@ static void createElementMSH(GModel *m, int num, int type, int physical,
int GModel::readMSH(const std::string &name)
{
FILE *fp = fopen(name.c_str(), "r");
FILE *fp = fopen(name.c_str(), "rb");
if(!fp){
Msg(GERROR, "Unable to open file '%s'", name.c_str());
return 0;
......
......@@ -4129,6 +4129,35 @@ fi
fi
fi
echo "$as_me:$LINENO: checking for ./contrib/FourierModel/model.cpp" >&5
echo $ECHO_N "checking for ./contrib/FourierModel/model.cpp... $ECHO_C" >&6
if test "${ac_cv_file___contrib_FourierModel_model_cpp+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
test "$cross_compiling" = yes &&
{ { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
{ (exit 1); exit 1; }; }
if test -r "./contrib/FourierModel/model.cpp"; then
ac_cv_file___contrib_FourierModel_model_cpp=yes
else
ac_cv_file___contrib_FourierModel_model_cpp=no
fi
fi
echo "$as_me:$LINENO: result: $ac_cv_file___contrib_FourierModel_model_cpp" >&5
echo "${ECHO_T}$ac_cv_file___contrib_FourierModel_model_cpp" >&6
if test $ac_cv_file___contrib_FourierModel_model_cpp = yes; then
FOURIER="yes"
else
FOURIER="no"
fi
if test "x${FOURIER}" = "xyes"; then
GMSH_DIRS="${GMSH_DIRS} contrib/FourierModel"
GMSH_LIBS="${GMSH_LIBS} -Lcontrib/FourierModel -lFourierModel"
FLAGS="-DHAVE_FOURIER_MODEL ${FLAGS}"
fi
fi
if test "x$enable_gsl" != "xno"; then
......
dnl $Id: configure.in,v 1.100 2006-08-12 19:34:14 geuzaine Exp $
dnl $Id: configure.in,v 1.101 2006-08-24 16:55:28 geuzaine Exp $
dnl
dnl Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
dnl
......@@ -457,6 +457,14 @@ if test "x$enable_contrib" != "xno"; then
fi
fi
dnl Check for FourierModel
AC_CHECK_FILE(./contrib/FourierModel/model.cpp, FOURIER="yes", FOURIER="no")
if test "x${FOURIER}" = "xyes"; then
GMSH_DIRS="${GMSH_DIRS} contrib/FourierModel"
GMSH_LIBS="${GMSH_LIBS} -Lcontrib/FourierModel -lFourierModel"
FLAGS="-DHAVE_FOURIER_MODEL ${FLAGS}"
fi
fi
dnl Check for GSL
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment