vc++ fix

contrib/MathEval/Makefile

-# $Id: Makefile,v 1.16 2008-01-18 20:13:13 geuzaine Exp $
+# $Id: Makefile,v 1.17 2008-01-19 00:12:38 geuzaine Exp $
 #
 # Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
 #
@@ -21,10 +21,10 @@
 
 include ../../variables
 
-LIB = ../../lib/libGmshMathEval.a
-INCLUDE = -I../../Common -I../../DataStr
+LIB = ../../lib/libGmshMathEval${LIBEXT}
+INCLUDE = ${DASH}I../../Common ${DASH}I../../DataStr
 
-CFLAGS  = ${OPTIM} ${FLAGS} ${INCLUDE} 
+CFLAGS  = ${OPTIM} ${FLAGS} ${INCLUDE} ${SYSINCLUDE}
 
 SRC = matheval.cpp\
       node.cpp\
@@ -33,16 +33,16 @@ SRC = matheval.cpp\
       symbol_table.cpp\
       xmath.cpp
 
-OBJ = ${SRC:.cpp=.o}
+OBJ = ${SRC:.cpp=${OBJEXT}}
 
-.SUFFIXES: .o .cpp
+.SUFFIXES: ${OBJEXT} .cpp
 
 ${LIB}: ${OBJ}
-	${AR} ${LIB} ${OBJ}
+	${AR} ${ARFLAGS}${LIB} ${OBJ}
 	${RANLIB} ${LIB}
 
-.cpp.o:
-	${CXX} ${CFLAGS} -c $<
+.cpp${OBJEXT}:
+	${CXX} ${CFLAGS} ${DASH}c $<
 
 parser:
 	bison --output parser.tab.cpp -pme -d parser.y
@@ -50,7 +50,7 @@ parser:
 	flex -oscanner.yy.cpp -Pme scanner.l
 
 clean:
-	rm -f *.o
+	rm -f *${OBJEXT}
 
 depend:
 	(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \

contrib/MathEval/scanner.yy.cpp

@@ -20,7 +20,7 @@
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
- * $Header: /cvsroot/gmsh/contrib/MathEval/scanner.yy.cpp,v 1.2 2007-05-05 11:19:40 geuzaine Exp $
+ * $Header: /cvsroot/gmsh/contrib/MathEval/scanner.yy.cpp,v 1.3 2008-01-19 00:12:38 geuzaine Exp $
  */
 
 #define FLEX_SCANNER
@@ -41,7 +41,7 @@
 #ifdef __cplusplus
 
 #include <stdlib.h>
-#include <unistd.h>
+//#include <unistd.h>
 
 /* Use prototypes in function declarations. */
 #define YY_USE_PROTOS

contrib/MathEval/xmath.cpp

@@ -87,7 +87,7 @@ x_actanh(double x)
   /*
    * Calculate inverse hyperbolic cotangent value.
    */
-  return atanh(1 / x);
+  return 0.5 * log((x + 1) / (x - 1));
 }
 
 double

contrib/Triangle/Makefile

-# $Id: Makefile,v 1.7 2008-01-18 20:13:13 geuzaine Exp $
+# $Id: Makefile,v 1.8 2008-01-19 00:14:19 geuzaine Exp $
 #
 # Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
 #
@@ -21,27 +21,27 @@
 
 include ../../variables
 
-LIB = ../../lib/libGmshTriangle.a
+LIB = ../../lib/libGmshTriangle${LIBEXT}
 
 # Don't optimize triangle: it crashes on Linux
 # CFLAGS = ${OPTIM} ${FLAGS} -DTRILIBRARY -DNO_TIMER
-CFLAGS = ${FLAGS} -DTRILIBRARY -DNO_TIMER
+CFLAGS = ${FLAGS} ${DASH}DTRILIBRARY ${DASH}DNO_TIMER
 
 SRC = triangle.c
 
-OBJ = ${SRC:.c=.o}
+OBJ = ${SRC:.c=${OBJEXT}}
 
-.SUFFIXES: .o .c
+.SUFFIXES: ${OBJEXT} .c
 
 ${LIB}: ${OBJ} 
-	${AR} ${LIB} ${OBJ} 
+	${AR} ${ARFLAGS}${LIB} ${OBJ} 
 	${RANLIB} ${LIB}
 
-.c.o:
-	${CC} ${CFLAGS} -c $<
+.c${OBJEXT}:
+	${CC} ${CFLAGS} ${DASH}c $<
 
 clean:
-	rm -f *.o
+	rm -f *${OBJEXT}
 
 depend:
 	(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \