From a423959145220826b000dde5a95c31fdd32544e2 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sat, 19 Jan 2008 00:14:19 +0000
Subject: [PATCH] vc++ fix
---
contrib/MathEval/Makefile | 20 ++++++++++----------
contrib/MathEval/scanner.yy.cpp | 4 ++--
contrib/MathEval/xmath.cpp | 2 +-
contrib/Triangle/Makefile | 18 +++++++++---------
4 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/contrib/MathEval/Makefile b/contrib/MathEval/Makefile
index 74ef4b15c7..72c3a57a6b 100644
--- a/contrib/MathEval/Makefile
+++ b/contrib/MathEval/Makefile
@@ -1,4 +1,4 @@
-# $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 && \
diff --git a/contrib/MathEval/scanner.yy.cpp b/contrib/MathEval/scanner.yy.cpp
index c819cd362a..232093cfe7 100644
--- a/contrib/MathEval/scanner.yy.cpp
+++ b/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
diff --git a/contrib/MathEval/xmath.cpp b/contrib/MathEval/xmath.cpp
index da1479b032..9f431af284 100644
--- a/contrib/MathEval/xmath.cpp
+++ b/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
diff --git a/contrib/Triangle/Makefile b/contrib/Triangle/Makefile
index aa1c643d09..6368135389 100644
--- a/contrib/Triangle/Makefile
+++ b/contrib/Triangle/Makefile
@@ -1,4 +1,4 @@
-# $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 && \
--
GitLab