diff --git a/Box/Makefile b/Box/Makefile
index 731cb2491a91b518fbf678688fdb68966ae82868..20d47e32306f041c49d5c7c34826aecd4545f394 100644
--- a/Box/Makefile
+++ b/Box/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.39 2008-01-18 20:02:27 geuzaine Exp $
+# $Id: Makefile,v 1.40 2008-01-18 21:00:39 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
@@ -22,10 +22,10 @@
include ../variables
LIB = ../lib/libGmshBox${LIBEXT}
-INCLUDE = ${ISYM}../Common ${ISYM}../DataStr ${ISYM}../Geo ${ISYM}../Mesh\
- ${ISYM}../Post ${ISYM}../Graphics ${ISYM}../Numeric ${ISYM}../Parser\
- ${ISYM}../Fltk ${ISYM}../Plugin ${ISYM}../Parallel\
- ${ISYM}../contrib/ANN/include
+INCLUDE = ${DASH}I../Common ${DASH}I../DataStr ${DASH}I../Geo ${DASH}I../Mesh\
+ ${DASH}I../Post ${DASH}I../Graphics ${DASH}I../Numeric ${DASH}I../Parser\
+ ${DASH}I../Fltk ${DASH}I../Plugin ${DASH}I../Parallel\
+ ${DASH}I../contrib/ANN/include
CFLAGS = ${OPTIM} ${FLAGS} ${INCLUDE} ${SYSINCLUDE}
SRC = Box.cpp
@@ -39,7 +39,7 @@ ${LIB}: ${OBJ} Main${OBJEXT}
${RANLIB} ${LIB}
.cpp${OBJEXT}:
- ${CXX} ${CFLAGS} ${CSYM} $<
+ ${CXX} ${CFLAGS} ${DASH}c $<
clean:
rm -f *${OBJEXT}
diff --git a/Common/Makefile b/Common/Makefile
index 5f3d0d59b4219aff84596091dcaf0cf8c02179da..f8505a5619b949396a59348746b7073e62fc92d7 100644
--- a/Common/Makefile
+++ b/Common/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.146 2008-01-18 20:13:12 geuzaine Exp $
+# $Id: Makefile,v 1.147 2008-01-18 21:00:39 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
@@ -22,10 +22,10 @@
include ../variables
LIB = ../lib/libGmshCommon${LIBEXT}
-INCLUDE = ${ISYM}../Common ${ISYM}../DataStr ${ISYM}../Geo ${ISYM}../Mesh\
- ${ISYM}../Post ${ISYM}../Graphics ${ISYM}../Numeric ${ISYM}../Parser\
- ${ISYM}../Plugin ${ISYM}../Fltk ${ISYM}../contrib/MathEval\
- ${ISYM}../contrib/ANN/include
+INCLUDE = ${DASH}I../Common ${DASH}I../DataStr ${DASH}I../Geo ${DASH}I../Mesh\
+ ${DASH}I../Post ${DASH}I../Graphics ${DASH}I../Numeric ${DASH}I../Parser\
+ ${DASH}I../Plugin ${DASH}I../Fltk ${DASH}I../contrib/MathEval\
+ ${DASH}I../contrib/ANN/include
CFLAGS =${OPTIM} ${FLAGS} ${INCLUDE} ${SYSINCLUDE}
SRC = Context.cpp\
@@ -48,7 +48,7 @@ ${LIB}: ${OBJ}
${RANLIB} ${LIB}
.cpp${OBJEXT}:
- ${CXX} ${CFLAGS} ${CSYM} $<
+ ${CXX} ${CFLAGS} ${DASH}c $<
clean:
rm -f *${OBJEXT}
diff --git a/DataStr/Makefile b/DataStr/Makefile
index fec59e439f585e649cc159796e14c7e6329e1f7c..879ffed3574d7c03eb2e622cd20882e694f78c12 100644
--- a/DataStr/Makefile
+++ b/DataStr/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.41 2008-01-18 20:13:12 geuzaine Exp $
+# $Id: Makefile,v 1.42 2008-01-18 21:00:39 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
@@ -22,7 +22,7 @@
include ../variables
LIB = ../lib/libGmshDataStr${LIBEXT}
-INCLUDE = ${ISYM}../Common
+INCLUDE = ${DASH}I../Common
CFLAGS = ${OPTIM} ${FLAGS} ${INCLUDE} ${SYSINCLUDE}
SRC = List.cpp \
@@ -41,7 +41,7 @@ ${LIB}: ${OBJ}
${RANLIB} ${LIB}
.cpp${OBJEXT}:
- ${CXX} ${CFLAGS} ${CSYM} $<
+ ${CXX} ${CFLAGS} ${DASH}c $<
clean:
rm -f *${OBJEXT}
diff --git a/Geo/Makefile b/Geo/Makefile
index 3a8dced94d6f5090a16b325252db9ad9d8dfb6bf..cf87439d0c7f46822343447b0c78df8bc139e82f 100644
--- a/Geo/Makefile
+++ b/Geo/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.170 2008-01-18 20:13:12 geuzaine Exp $
+# $Id: Makefile,v 1.171 2008-01-18 21:00:40 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
@@ -22,10 +22,10 @@
include ../variables
LIB = ../lib/libGmshGeo${LIBEXT}
-INCLUDE = ${ISYM}../Common ${ISYM}../DataStr ${ISYM}../Geo ${ISYM}../Mesh\
- ${ISYM}../Post ${ISYM}../Numeric ${ISYM}../Parser ${ISYM}../Fltk\
- ${ISYM}../contrib/NR ${ISYM}../contrib/ANN/include\
- ${ISYM}../contrib/MathEval
+INCLUDE = ${DASH}I../Common ${DASH}I../DataStr ${DASH}I../Geo ${DASH}I../Mesh\
+ ${DASH}I../Post ${DASH}I../Numeric ${DASH}I../Parser ${DASH}I../Fltk\
+ ${DASH}I../contrib/NR ${DASH}I../contrib/ANN/include\
+ ${DASH}I../contrib/MathEval
CFLAGS = ${OPTIM} ${FLAGS} ${INCLUDE} ${SYSINCLUDE}
SRC = GEntity.cpp\
@@ -57,7 +57,7 @@ ${LIB}: ${OBJ}
${RANLIB} ${LIB}
.cpp${OBJEXT}:
- ${CXX} ${CFLAGS} ${CSYM} $<
+ ${CXX} ${CFLAGS} ${DASH}c $<
clean:
rm -f *${OBJEXT}
diff --git a/Makefile b/Makefile
index d1c5b4099704f056e17fce2c39fe36bd6030f8c0..4620fdca7fdc6b4bdf0dbb2d98f856dbba3565c5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.448 2008-01-18 20:02:27 geuzaine Exp $
+# $Id: Makefile,v 1.449 2008-01-18 21:00:39 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
@@ -36,7 +36,7 @@ GMSH_DATE = `date "+%Y%m%d"`
all: link
link: compile
- ${LINKER} ${OPTIM} -o bin/gmsh ${GMSH_LIBS}
+ ${LINKER} ${OPTIM} ${DASH}o bin/gmsh${EXEEXT} ${GMSH_LIBS}
link-mac-universal: compile
${LINKER} -arch i386 ${OPTIM} -o bin/gmsh_i386 ${GMSH_LIBS}
diff --git a/Mesh/Makefile b/Mesh/Makefile
index c897464e1a441d6bce01fb57b83722fb27ee8d9e..e956d9a257034fcc5ea61a71a216b02d6e6f1466 100644
--- a/Mesh/Makefile
+++ b/Mesh/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.191 2008-01-18 20:13:12 geuzaine Exp $
+# $Id: Makefile,v 1.192 2008-01-18 21:00:40 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
@@ -22,14 +22,14 @@
include ../variables
LIB = ../lib/libGmshMesh${LIBEXT}
-INCLUDE = ${ISYM}../Numeric ${ISYM}../Common ${ISYM}../DataStr ${ISYM}../Geo\
- ${ISYM}../Mesh ${ISYM}../Post ${ISYM}../Graphics ${ISYM}../Parser\
- ${ISYM}../Fltk ${ISYM}../contrib/NR ${ISYM}../contrib/Triangle\
- ${ISYM}../contrib/Tetgen ${ISYM}../contrib/Netgen\
- ${ISYM}../contrib/Netgen/libsrc/include\
- ${ISYM}../contrib/Netgen/libsrc/interface\
- ${ISYM}../contrib/ANN/include ${ISYM}../contrib/Metis\
- ${ISYM}../contrib/MathEval
+INCLUDE = ${DASH}I../Numeric ${DASH}I../Common ${DASH}I../DataStr ${DASH}I../Geo\
+ ${DASH}I../Mesh ${DASH}I../Post ${DASH}I../Graphics ${DASH}I../Parser\
+ ${DASH}I../Fltk ${DASH}I../contrib/NR ${DASH}I../contrib/Triangle\
+ ${DASH}I../contrib/Tetgen ${DASH}I../contrib/Netgen\
+ ${DASH}I../contrib/Netgen/libsrc/include\
+ ${DASH}I../contrib/Netgen/libsrc/interface\
+ ${DASH}I../contrib/ANN/include ${DASH}I../contrib/Metis\
+ ${DASH}I../contrib/MathEval
CFLAGS = ${OPTIM} ${FLAGS} ${INCLUDE} ${SYSINCLUDE}
SRC = Generator.cpp \
@@ -63,11 +63,11 @@ ${LIB}: ${OBJ}
${RANLIB} ${LIB}
.cpp${OBJEXT}:
- ${CXX} ${CFLAGS} ${CSYM} $<
+ ${CXX} ${CFLAGS} ${DASH}c $<
# Don't optimize BDS: it crashes with some flavors of gcc 4.1 (e.g. on debian etch)
BDS.o:
- ${CXX} ${FLAGS} ${INCLUDE} ${SYSINCLUDE} ${CSYM} BDS.cpp
+ ${CXX} ${FLAGS} ${INCLUDE} ${SYSINCLUDE} ${DASH}c BDS.cpp
clean:
rm -f *${OBJEXT}
diff --git a/Numeric/Makefile b/Numeric/Makefile
index cc54d8245d0718af9dccd19c9c4513eeb565dddf..883036a75853665090d694518262579119d77b9c 100644
--- a/Numeric/Makefile
+++ b/Numeric/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.40 2008-01-18 20:13:12 geuzaine Exp $
+# $Id: Makefile,v 1.41 2008-01-18 21:00:40 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
@@ -22,7 +22,7 @@
include ../variables
LIB = ../lib/libGmshNumeric${LIBEXT}
-INCLUDE = ${ISYM}../Common ${ISYM}../DataStr ${ISYM}../Numeric ${ISYM}../contrib/NR
+INCLUDE = ${DASH}I../Common ${DASH}I../DataStr ${DASH}I../Numeric ${DASH}I../contrib/NR
CFLAGS = ${OPTIM} ${FLAGS} ${INCLUDE} ${SYSINCLUDE}
SRC = Numeric.cpp\
@@ -41,7 +41,7 @@ ${LIB}: ${OBJ}
${RANLIB} ${LIB}
.cpp${OBJEXT}:
- ${CXX} ${CFLAGS} ${CSYM} $<
+ ${CXX} ${CFLAGS} ${DASH}c $<
clean:
rm -f *${OBJEXT}
diff --git a/Parallel/Makefile b/Parallel/Makefile
index 87ccf6976c64ecfd06ad9872bb553d0ad917c807..8aec41896156b7ab0f61d83d6246d62a35826ba7 100644
--- a/Parallel/Makefile
+++ b/Parallel/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.38 2008-01-18 20:13:12 geuzaine Exp $
+# $Id: Makefile,v 1.39 2008-01-18 21:00:40 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
@@ -22,7 +22,7 @@
include ../variables
LIB = ../lib/libGmshParallel${LIBEXT}
-INCLUDE = ${ISYM}../Common ${ISYM}../DataStr
+INCLUDE = ${DASH}I../Common ${DASH}I../DataStr
CFLAGS = ${OPTIM} ${FLAGS} ${INCLUDE} ${SYSINCLUDE}
SRC = ParUtil.cpp
@@ -36,7 +36,7 @@ ${LIB}: ${OBJ}
${RANLIB} ${LIB}
.cpp${OBJEXT}:
- ${CXX} ${CFLAGS} ${CSYM} $<
+ ${CXX} ${CFLAGS} ${DASH}c $<
clean:
rm -f *${OBJEXT}
diff --git a/Parser/Makefile b/Parser/Makefile
index 15aaab73c6e0417ceab6015d83ade2dac01a8e60..17f0b524512978ff62825f67832c6e53d4ce3c08 100644
--- a/Parser/Makefile
+++ b/Parser/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.132 2008-01-18 20:13:13 geuzaine Exp $
+# $Id: Makefile,v 1.133 2008-01-18 21:00:40 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
@@ -22,9 +22,9 @@
include ../variables
LIB = ../lib/libGmshParser${LIBEXT}
-INCLUDE = ${ISYM}../Common ${ISYM}../DataStr ${ISYM}../Geo ${ISYM}../Mesh\
- ${ISYM}../Post ${ISYM}../Graphics ${ISYM}../Numeric ${ISYM}../Fltk\
- ${ISYM}../Plugin ${ISYM}../Parallel ${ISYM}../contrib/ANN/include
+INCLUDE = ${DASH}I../Common ${DASH}I../DataStr ${DASH}I../Geo ${DASH}I../Mesh\
+ ${DASH}I../Post ${DASH}I../Graphics ${DASH}I../Numeric ${DASH}I../Fltk\
+ ${DASH}I../Plugin ${DASH}I../Parallel ${DASH}I../contrib/ANN/include
CFLAGS = ${OPTIM} ${FLAGS} ${INCLUDE} ${SYSINCLUDE}
SRC = Gmsh.tab.cpp\
@@ -42,12 +42,12 @@ ${LIB}: ${OBJ}
${RANLIB} ${LIB}
.cpp${OBJEXT}:
- ${CXX} ${CFLAGS} ${CSYM} $<
+ ${CXX} ${CFLAGS} ${DASH}c $<
# Don't optimize Gmsh.tab.o: on many architectures, g++ -O2 generates
# assembly code too large to be addressed correctly
Gmsh.tab.o:
- ${CXX} ${FLAGS} ${INCLUDE} ${SYSINCLUDE} ${CSYM} Gmsh.tab.cpp
+ ${CXX} ${FLAGS} ${INCLUDE} ${SYSINCLUDE} ${DASH}c Gmsh.tab.cpp
parser:
bison --output Gmsh.tab.cpp -d Gmsh.y
diff --git a/Plugin/Makefile b/Plugin/Makefile
index 9ed7560366520cd631bfc49caa74368c46067518..38399870cd04277e3825b8d33b1d1289ff539d28 100644
--- a/Plugin/Makefile
+++ b/Plugin/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.137 2008-01-18 20:13:13 geuzaine Exp $
+# $Id: Makefile,v 1.138 2008-01-18 21:00:40 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
@@ -22,10 +22,10 @@
include ../variables
LIB = ../lib/libGmshPlugin${LIBEXT}
-INCLUDE = ${ISYM}../Common ${ISYM}../Graphics ${ISYM}../DataStr ${ISYM}../Geo\
- ${ISYM}../Mesh ${ISYM}../Post ${ISYM}../Fltk ${ISYM}../Numeric\
- ${ISYM}../contrib/ANN/include ${ISYM}../contrib/Triangle\
- ${ISYM}../contrib/MathEval
+INCLUDE = ${DASH}I../Common ${DASH}I../Graphics ${DASH}I../DataStr ${DASH}I../Geo\
+ ${DASH}I../Mesh ${DASH}I../Post ${DASH}I../Fltk ${DASH}I../Numeric\
+ ${DASH}I../contrib/ANN/include ${DASH}I../contrib/Triangle\
+ ${DASH}I../contrib/MathEval
CFLAGS = ${OPTIM} ${FLAGS} ${INCLUDE} ${SYSINCLUDE}
SRC = Plugin.cpp PluginManager.cpp\
@@ -57,7 +57,7 @@ ${LIB}: ${OBJ}
${RANLIB} ${LIB}
.cpp${OBJEXT}:
- ${CXX} ${CFLAGS} ${CSYM} $<
+ ${CXX} ${CFLAGS} ${DASH}c $<
clean:
rm -f *${OBJEXT}
diff --git a/Post/Makefile b/Post/Makefile
index 26f2d6e5a702f8c3ef6fecb2b290e1634af8176e..2c72c03ae265d4af24c922a8123c04b749008d55 100644
--- a/Post/Makefile
+++ b/Post/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.20 2008-01-18 20:13:13 geuzaine Exp $
+# $Id: Makefile,v 1.21 2008-01-18 21:00:40 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
@@ -22,10 +22,10 @@
include ../variables
LIB = ../lib/libGmshPost${LIBEXT}
-INCLUDE = ${ISYM}../Common ${ISYM}../DataStr ${ISYM}../Geo ${ISYM}../Mesh\
- ${ISYM}../Post ${ISYM}../Graphics ${ISYM}../Numeric ${ISYM}../Parser\
- ${ISYM}../Plugin ${ISYM}../Fltk ${ISYM}../contrib/MathEval\
- ${ISYM}../contrib/ANN/include
+INCLUDE = ${DASH}I../Common ${DASH}I../DataStr ${DASH}I../Geo ${DASH}I../Mesh\
+ ${DASH}I../Post ${DASH}I../Graphics ${DASH}I../Numeric ${DASH}I../Parser\
+ ${DASH}I../Plugin ${DASH}I../Fltk ${DASH}I../contrib/MathEval\
+ ${DASH}I../contrib/ANN/include
CFLAGS =${OPTIM} ${FLAGS} ${INCLUDE} ${SYSINCLUDE}
SRC = PView.cpp\
@@ -46,7 +46,7 @@ ${LIB}: ${OBJ}
${RANLIB} ${LIB}
.cpp${OBJEXT}:
- ${CXX} ${CFLAGS} ${CSYM} $<
+ ${CXX} ${CFLAGS} ${DASH}c $<
clean:
rm -f *${OBJEXT}
diff --git a/configure b/configure
index 58f06a5a8a87fbb8f26b37c87a7c59f5c02ba47a..fbe1f5c0ab6d5310eb3b6911725a11b722681797 100755
--- a/configure
+++ b/configure
@@ -679,8 +679,7 @@ GMSH_DIRS
GMSH_LIBS
ARFLAGS
LIBEXT
-ISYM
-CSYM
+DASH
SYSINCLUDE
LIBOBJS
LTLIBOBJS'
@@ -1952,9 +1951,7 @@ if test "x$enable_vc" = "xyes"; then
CXX="cl /EHsc"
OBJEXT=.obj
LIBEXT=.lib
- ISYM=/I
- CSYM=/c
- DSYM=/D
+ DASH=/
FLAGS=/DWIN32 /DYY_NO_UNISTD_H /DHAVE_NO_DLL
OPTIM=/O2
SYSINCLUDE="/I\"C:\Program Files\Microsoft Visual Studio 9.0\VC\INCLUDE\" /I\"C:\Program Files\Microsoft SDKs\Windows\v6.0A\include\""
@@ -3481,9 +3478,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
- ISYM=-I
- CSYM=-c
- DSYM=-D
+ DASH=-
FLAGS=""
OPTIM="${CXXFLAGS}"
SYSINCLUDE=""
@@ -4132,9 +4127,13 @@ fi
else
GMSH_DIRS="${GMSH_DIRS} Box"
- GMSH_LIBS="-Llib Box/Main${OBJEXT} -lGmshBox -lGmshParser -lGmshMesh -lGmshGeo"
- GMSH_LIBS="${GMSH_LIBS} -lGmshPlugin -lGmshPost -lGmshCommon -lGmshDataStr"
- GMSH_LIBS="${GMSH_LIBS} -lGmshNumeric -lGmshParallel"
+ if test "x$enable_vc" = "xyes"; then
+ GMSH_LIBS=lib/*.lib
+ else
+ GMSH_LIBS="-Llib Box/Main${OBJEXT} -lGmshBox -lGmshParser -lGmshMesh -lGmshGeo"
+ GMSH_LIBS="${GMSH_LIBS} -lGmshPlugin -lGmshPost -lGmshCommon -lGmshDataStr"
+ GMSH_LIBS="${GMSH_LIBS} -lGmshNumeric -lGmshParallel"
+ fi
ZLIB=""
if test "x$enable_zlib" != "xno"; then
@@ -4524,7 +4523,7 @@ fi
if test "x$enable_triangle" != "xno"; then
GMSH_DIRS="${GMSH_DIRS} contrib/Triangle"
GMSH_LIBS="${GMSH_LIBS} -lGmshTriangle"
- FLAGS="${DSYM}HAVE_TRIANGLE ${FLAGS}"
+ FLAGS="${DASH}DHAVE_TRIANGLE ${FLAGS}"
echo "********************************************************************"
echo "You are building a version of Gmsh that contains Jonathan"
echo "Shewchuk's Triangle as an alternative isotropic 2D mesh generator."
@@ -4578,7 +4577,7 @@ fi
if test "x$enable_ann" != "xno"; then
GMSH_DIRS="${GMSH_DIRS} contrib/ANN"
GMSH_LIBS="${GMSH_LIBS} -lGmshANN"
- FLAGS="${DSYM}HAVE_ANN_ ${FLAGS}"
+ FLAGS="${DASH}DHAVE_ANN_ ${FLAGS}"
echo "********************************************************************"
echo "You are building a version of Gmsh that contains ANN, the"
echo "Approximate Nearest Neighbor library."
@@ -4627,7 +4626,7 @@ fi
if test "x$enable_metis" = "xyes"; then
GMSH_DIRS="${GMSH_DIRS} contrib/Metis"
GMSH_LIBS="${GMSH_LIBS} -lGmshMetis"
- FLAGS="${DSYM}HAVE_METIS ${FLAGS}"
+ FLAGS="${DASH}DHAVE_METIS ${FLAGS}"
echo "********************************************************************"
echo "You are building a version of Gmsh that contains METIS, the"
echo "Serial Graph Partitioner."
@@ -4676,7 +4675,7 @@ fi
if test "x$enable_netgen" != "xno"; then
GMSH_DIRS="${GMSH_DIRS} contrib/Netgen"
GMSH_LIBS="${GMSH_LIBS} -lGmshNetgen"
- FLAGS="${DSYM}HAVE_NETGEN ${FLAGS}"
+ FLAGS="${DASH}DHAVE_NETGEN ${FLAGS}"
echo "********************************************************************"
echo "You are building a version of Gmsh that contains Joachim Schoberl's"
echo "Netgen as an alternative 3D mesh generator. Netgen is distributed"
@@ -4726,7 +4725,7 @@ fi
if test "x$enable_tetgen" != "xno"; then
GMSH_DIRS="${GMSH_DIRS} contrib/Tetgen"
GMSH_LIBS="${GMSH_LIBS} -lGmshTetgen"
- FLAGS="${DSYM}HAVE_TETGEN ${FLAGS}"
+ FLAGS="${DASH}DHAVE_TETGEN ${FLAGS}"
echo "********************************************************************"
echo "You are building a version of Gmsh that contains Hang Si's"
echo "Tetgen as an alternative 3D mesh generator."
@@ -4779,7 +4778,7 @@ fi
if test "x${MATHEVAL}" = "xyes"; then
GMSH_DIRS="${GMSH_DIRS} contrib/MathEval"
GMSH_LIBS="${GMSH_LIBS} -lGmshMathEval"
- FLAGS="${DSYM}HAVE_MATH_EVAL ${FLAGS}"
+ FLAGS="${DASH}DHAVE_MATH_EVAL ${FLAGS}"
fi
fi
@@ -4916,12 +4915,12 @@ else
fi
if test "x${GSL}" = "xyes"; then
- FLAGS="${DSYM}HAVE_GSL ${FLAGS}"
+ FLAGS="${DASH}DHAVE_GSL ${FLAGS}"
if test "x${GSL_PREFIX}" = "x"; then
GMSH_LIBS="${GMSH_LIBS} -lgsl -lgslcblas"
else
GMSH_LIBS="${GMSH_LIBS} -L${GSL_PREFIX} -L${GSL_PREFIX}/lib -lgsl -lgslcblas"
- FLAGS="${FLAGS} ${ISYM}${GSL_PREFIX} ${ISYM}${GSL_PREFIX}/include"
+ FLAGS="${FLAGS} ${DASH}I${GSL_PREFIX} ${DASH}I${GSL_PREFIX}/include"
fi
fi
fi
@@ -5050,10 +5049,10 @@ fi
if test "x${CGNS}" = "xyes"; then
if test "x${CGNS_PREFIX}" = "x"; then
GMSH_LIBS="${GMSH_LIBS} -lcgns"
- FLAGS="${FLAGS} ${DSYM}HAVE_LIBCGNS"
+ FLAGS="${FLAGS} ${DASH}DHAVE_LIBCGNS"
else
GMSH_LIBS="${GMSH_LIBS} -L${CGNS_PREFIX}/lib -lcgns"
- FLAGS="${FLAGS} ${DSYM}HAVE_LIBCGNS ${ISYM}${CGNS_PREFIX}/include"
+ FLAGS="${FLAGS} ${DASH}DHAVE_LIBCGNS ${DASH}I${CGNS_PREFIX}/include"
fi
fi
fi
@@ -5140,10 +5139,10 @@ fi
OCC_LIBS="${OCC_LIBS} -lTKAdvTools -lTKMath -lTKernel"
if test "x${OCC_PREFIX}" = "x"; then
GMSH_LIBS="${GMSH_LIBS} ${OCC_LIBS}"
- FLAGS="${FLAGS} ${DSYM}HAVE_OCC"
+ FLAGS="${FLAGS} ${DASH}DHAVE_OCC"
else
GMSH_LIBS="${GMSH_LIBS} -L${OCC_PREFIX}/lib ${OCC_LIBS}"
- FLAGS="${FLAGS} ${DSYM}HAVE_OCC ${ISYM}${OCC_PREFIX}/inc"
+ FLAGS="${FLAGS} ${DASH}DHAVE_OCC ${DASH}I${OCC_PREFIX}/inc"
fi
fi
fi
@@ -5663,16 +5662,16 @@ echo "$as_me: WARNING: Could not find FFTW3: disabling FourierModel." >&2;}
else
if test "x${FM_PREFIX}" = "x"; then
GMSH_LIBS="${GMSH_LIBS} -lFourierModel"
- FLAGS="${DSYM}HAVE_FOURIER_MODEL ${FLAGS}"
+ FLAGS="${DASH}DHAVE_FOURIER_MODEL ${FLAGS}"
else
GMSH_LIBS="${GMSH_LIBS} -L${FM_PREFIX}/lib -lFourierModel"
- FLAGS="${DSYM}HAVE_FOURIER_MODEL ${ISYM}${FM_PREFIX} ${FLAGS}"
+ FLAGS="${DASH}DHAVE_FOURIER_MODEL ${DASH}I${FM_PREFIX} ${FLAGS}"
fi
if test "x${FFTW3_PREFIX}" = "x"; then
GMSH_LIBS="${GMSH_LIBS} -lfftw3"
else
GMSH_LIBS="${GMSH_LIBS} -L${FFTW3_PREFIX}/lib -lfftw3"
- FLAGS="${FLAGS} ${ISYM}${FFTW3_PREFIX}/include"
+ FLAGS="${FLAGS} ${DASH}I${FFTW3_PREFIX}/include"
fi
if test "x${BLAS_LAPACK_PREFIX}" != "x"; then
GMSH_LIBS="${GMSH_LIBS} -L${BLAS_LAPACK_PREFIX} -L${BLAS_LAPACK_PREFIX}/lib"
@@ -5762,7 +5761,7 @@ fi
GMSH_LIBS="${GMSH_LIBS} -lhdf5"
else
GMSH_LIBS="${GMSH_LIBS} -L${HDF5_PREFIX}/lib -lhdf5"
- FLAGS="${FLAGS} ${ISYM}${HDF5_PREFIX}/include"
+ FLAGS="${FLAGS} ${DASH}I${HDF5_PREFIX}/include"
fi
fi
fi
@@ -5837,10 +5836,10 @@ fi
if test "x${MED}" = "xyes"; then
if test "x${MED_PREFIX}" = "x"; then
GMSH_LIBS="${GMSH_LIBS} -lmed"
- FLAGS="${FLAGS} ${DSYM}HAVE_MED"
+ FLAGS="${FLAGS} ${DASH}DHAVE_MED"
else
GMSH_LIBS="${GMSH_LIBS} -L${MED_PREFIX}/lib -lmed"
- FLAGS="${FLAGS} ${DSYM}HAVE_MED ${ISYM}${MED_PREFIX}/include"
+ FLAGS="${FLAGS} ${DASH}DHAVE_MED ${DASH}I${MED_PREFIX}/include"
fi
fi
fi
@@ -5848,20 +5847,20 @@ fi
if test "x${ZLIB}" = "xyes"; then
if test "x${FL_ZLIB}" = "xyes"; then
- FLAGS="${DSYM}HAVE_LIBZ ${FLAGS}"
+ FLAGS="${DASH}DHAVE_LIBZ ${FLAGS}"
else
- FLAGS="${DSYM}HAVE_LIBZ ${FLAGS}"
+ FLAGS="${DASH}DHAVE_LIBZ ${FLAGS}"
if test "x${ZLIB_PREFIX}" = "x"; then
GMSH_LIBS="${GMSH_LIBS} -lz"
else
GMSH_LIBS="${GMSH_LIBS} -L${ZLIB_PREFIX} -L${ZLIB_PREFIX}/lib -lz"
- FLAGS="${FLAGS} ${ISYM}${ZLIB_PREFIX} ${ISYM}${ZLIB_PREFIX}/include"
+ FLAGS="${FLAGS} ${DASH}I${ZLIB_PREFIX} ${DASH}I${ZLIB_PREFIX}/include"
fi
fi
fi
if test "x$enable_parallel" = "xyes"; then
- FLAGS="${DSYM}HAVE_PARALLEL ${FLAGS}"
+ FLAGS="${DASH}DHAVE_PARALLEL ${FLAGS}"
fi
GMSH_LIBS="${GMSH_LIBS} -lm"
@@ -6967,7 +6966,7 @@ if test $ac_cv_sizeof_size_t != 4; then
{ echo "$as_me:$LINENO: WARNING: Unsupported size of size_t - this may affect FNV hashing." >&5
echo "$as_me: WARNING: Unsupported size of size_t - this may affect FNV hashing." >&2;}
else
- FLAGS="$FLAGS ${DSYM}HAVE_64BIT_SIZE_T"
+ FLAGS="$FLAGS ${DASH}DHAVE_64BIT_SIZE_T"
fi
fi
@@ -6984,7 +6983,6 @@ fi
-
ac_config_files="$ac_config_files variables"
cat >confcache <<\_ACEOF
@@ -7681,14 +7679,13 @@ GMSH_DIRS!$GMSH_DIRS$ac_delim
GMSH_LIBS!$GMSH_LIBS$ac_delim
ARFLAGS!$ARFLAGS$ac_delim
LIBEXT!$LIBEXT$ac_delim
-ISYM!$ISYM$ac_delim
-CSYM!$CSYM$ac_delim
+DASH!$DASH$ac_delim
SYSINCLUDE!$SYSINCLUDE$ac_delim
LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 71; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 70; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/configure.in b/configure.in
index 492fa97793a4e9d07fbc153ce3b979c4d3570b21..de210571bd31f4ebc1eff0b55acbeb09eb03c8ac 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.142 2008-01-18 20:41:33 geuzaine Exp $
+dnl $Id: configure.in,v 1.143 2008-01-18 21:00:39 geuzaine Exp $
dnl
dnl Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
dnl
@@ -161,9 +161,7 @@ if test "x$enable_vc" = "xyes"; then
CXX="cl /EHsc"
OBJEXT=.obj
LIBEXT=.lib
- ISYM=/I
- CSYM=/c
- DSYM=/D
+ DASH=/
FLAGS=/DWIN32 /DYY_NO_UNISTD_H /DHAVE_NO_DLL
OPTIM=/O2
SYSINCLUDE="/I\"C:\Program Files\Microsoft Visual Studio 9.0\VC\INCLUDE\" /I\"C:\Program Files\Microsoft SDKs\Windows\v6.0A\include\""
@@ -178,9 +176,7 @@ else
OBJEXT=.o
LIBEXT=.a
AC_PROG_CPP
- ISYM=-I
- CSYM=-c
- DSYM=-D
+ DASH=-
FLAGS=""
OPTIM="${CXXFLAGS}"
SYSINCLUDE=""
@@ -364,9 +360,13 @@ if test "x$enable_gui" != "xno" -a "x$enable_vc" != "xyes"; then
else
GMSH_DIRS="${GMSH_DIRS} Box"
- GMSH_LIBS="-Llib Box/Main${OBJEXT} -lGmshBox -lGmshParser -lGmshMesh -lGmshGeo"
- GMSH_LIBS="${GMSH_LIBS} -lGmshPlugin -lGmshPost -lGmshCommon -lGmshDataStr"
- GMSH_LIBS="${GMSH_LIBS} -lGmshNumeric -lGmshParallel"
+ if test "x$enable_vc" = "xyes"; then
+ GMSH_LIBS=lib/*.lib
+ else
+ GMSH_LIBS="-Llib Box/Main${OBJEXT} -lGmshBox -lGmshParser -lGmshMesh -lGmshGeo"
+ GMSH_LIBS="${GMSH_LIBS} -lGmshPlugin -lGmshPost -lGmshCommon -lGmshDataStr"
+ GMSH_LIBS="${GMSH_LIBS} -lGmshNumeric -lGmshParallel"
+ fi
dnl Check for libz
ZLIB=""
@@ -406,7 +406,7 @@ if test "x$enable_contrib" != "xno"; then
if test "x$enable_triangle" != "xno"; then
GMSH_DIRS="${GMSH_DIRS} contrib/Triangle"
GMSH_LIBS="${GMSH_LIBS} -lGmshTriangle"
- FLAGS="${DSYM}HAVE_TRIANGLE ${FLAGS}"
+ FLAGS="${DASH}DHAVE_TRIANGLE ${FLAGS}"
echo "********************************************************************"
echo "You are building a version of Gmsh that contains Jonathan"
echo "Shewchuk's Triangle as an alternative isotropic 2D mesh generator."
@@ -439,7 +439,7 @@ if test "x$enable_contrib" != "xno"; then
if test "x$enable_ann" != "xno"; then
GMSH_DIRS="${GMSH_DIRS} contrib/ANN"
GMSH_LIBS="${GMSH_LIBS} -lGmshANN"
- FLAGS="${DSYM}HAVE_ANN_ ${FLAGS}"
+ FLAGS="${DASH}DHAVE_ANN_ ${FLAGS}"
echo "********************************************************************"
echo "You are building a version of Gmsh that contains ANN, the"
echo "Approximate Nearest Neighbor library."
@@ -467,7 +467,7 @@ if test "x$enable_contrib" != "xno"; then
if test "x$enable_metis" = "xyes"; then
GMSH_DIRS="${GMSH_DIRS} contrib/Metis"
GMSH_LIBS="${GMSH_LIBS} -lGmshMetis"
- FLAGS="${DSYM}HAVE_METIS ${FLAGS}"
+ FLAGS="${DASH}DHAVE_METIS ${FLAGS}"
echo "********************************************************************"
echo "You are building a version of Gmsh that contains METIS, the"
echo "Serial Graph Partitioner."
@@ -495,7 +495,7 @@ if test "x$enable_contrib" != "xno"; then
if test "x$enable_netgen" != "xno"; then
GMSH_DIRS="${GMSH_DIRS} contrib/Netgen"
GMSH_LIBS="${GMSH_LIBS} -lGmshNetgen"
- FLAGS="${DSYM}HAVE_NETGEN ${FLAGS}"
+ FLAGS="${DASH}DHAVE_NETGEN ${FLAGS}"
echo "********************************************************************"
echo "You are building a version of Gmsh that contains Joachim Schoberl's"
echo "Netgen as an alternative 3D mesh generator. Netgen is distributed"
@@ -524,7 +524,7 @@ if test "x$enable_contrib" != "xno"; then
if test "x$enable_tetgen" != "xno"; then
GMSH_DIRS="${GMSH_DIRS} contrib/Tetgen"
GMSH_LIBS="${GMSH_LIBS} -lGmshTetgen"
- FLAGS="${DSYM}HAVE_TETGEN ${FLAGS}"
+ FLAGS="${DASH}DHAVE_TETGEN ${FLAGS}"
echo "********************************************************************"
echo "You are building a version of Gmsh that contains Hang Si's"
echo "Tetgen as an alternative 3D mesh generator."
@@ -556,7 +556,7 @@ if test "x$enable_contrib" != "xno"; then
if test "x${MATHEVAL}" = "xyes"; then
GMSH_DIRS="${GMSH_DIRS} contrib/MathEval"
GMSH_LIBS="${GMSH_LIBS} -lGmshMathEval"
- FLAGS="${DSYM}HAVE_MATH_EVAL ${FLAGS}"
+ FLAGS="${DASH}DHAVE_MATH_EVAL ${FLAGS}"
fi
fi
@@ -570,12 +570,12 @@ if test "x$enable_gsl" != "xno"; then
AC_CHECK_LIB(gslcblas,main)
AC_CHECK_LIB(gsl,main,GSL="yes",GSL="no")
if test "x${GSL}" = "xyes"; then
- FLAGS="${DSYM}HAVE_GSL ${FLAGS}"
+ FLAGS="${DASH}DHAVE_GSL ${FLAGS}"
if test "x${GSL_PREFIX}" = "x"; then
GMSH_LIBS="${GMSH_LIBS} -lgsl -lgslcblas"
else
GMSH_LIBS="${GMSH_LIBS} -L${GSL_PREFIX} -L${GSL_PREFIX}/lib -lgsl -lgslcblas"
- FLAGS="${FLAGS} ${ISYM}${GSL_PREFIX} ${ISYM}${GSL_PREFIX}/include"
+ FLAGS="${FLAGS} ${DASH}I${GSL_PREFIX} ${DASH}I${GSL_PREFIX}/include"
fi
fi
fi
@@ -622,10 +622,10 @@ if test "x$enable_cgns" = "xyes"; then
if test "x${CGNS}" = "xyes"; then
if test "x${CGNS_PREFIX}" = "x"; then
GMSH_LIBS="${GMSH_LIBS} -lcgns"
- FLAGS="${FLAGS} ${DSYM}HAVE_LIBCGNS"
+ FLAGS="${FLAGS} ${DASH}DHAVE_LIBCGNS"
else
GMSH_LIBS="${GMSH_LIBS} -L${CGNS_PREFIX}/lib -lcgns"
- FLAGS="${FLAGS} ${DSYM}HAVE_LIBCGNS ${ISYM}${CGNS_PREFIX}/include"
+ FLAGS="${FLAGS} ${DASH}DHAVE_LIBCGNS ${DASH}I${CGNS_PREFIX}/include"
fi
fi
fi
@@ -653,10 +653,10 @@ if test "x$enable_occ" = "xyes"; then
OCC_LIBS="${OCC_LIBS} -lTKAdvTools -lTKMath -lTKernel"
if test "x${OCC_PREFIX}" = "x"; then
GMSH_LIBS="${GMSH_LIBS} ${OCC_LIBS}"
- FLAGS="${FLAGS} ${DSYM}HAVE_OCC"
+ FLAGS="${FLAGS} ${DASH}DHAVE_OCC"
else
GMSH_LIBS="${GMSH_LIBS} -L${OCC_PREFIX}/lib ${OCC_LIBS}"
- FLAGS="${FLAGS} ${DSYM}HAVE_OCC ${ISYM}${OCC_PREFIX}/inc"
+ FLAGS="${FLAGS} ${DASH}DHAVE_OCC ${DASH}I${OCC_PREFIX}/inc"
fi
fi
fi
@@ -690,16 +690,16 @@ if test "x$enable_fm" != "xno"; then
else
if test "x${FM_PREFIX}" = "x"; then
GMSH_LIBS="${GMSH_LIBS} -lFourierModel"
- FLAGS="${DSYM}HAVE_FOURIER_MODEL ${FLAGS}"
+ FLAGS="${DASH}DHAVE_FOURIER_MODEL ${FLAGS}"
else
GMSH_LIBS="${GMSH_LIBS} -L${FM_PREFIX}/lib -lFourierModel"
- FLAGS="${DSYM}HAVE_FOURIER_MODEL ${ISYM}${FM_PREFIX} ${FLAGS}"
+ FLAGS="${DASH}DHAVE_FOURIER_MODEL ${DASH}I${FM_PREFIX} ${FLAGS}"
fi
if test "x${FFTW3_PREFIX}" = "x"; then
GMSH_LIBS="${GMSH_LIBS} -lfftw3"
else
GMSH_LIBS="${GMSH_LIBS} -L${FFTW3_PREFIX}/lib -lfftw3"
- FLAGS="${FLAGS} ${ISYM}${FFTW3_PREFIX}/include"
+ FLAGS="${FLAGS} ${DASH}I${FFTW3_PREFIX}/include"
fi
if test "x${BLAS_LAPACK_PREFIX}" != "x"; then
GMSH_LIBS="${GMSH_LIBS} -L${BLAS_LAPACK_PREFIX} -L${BLAS_LAPACK_PREFIX}/lib"
@@ -730,7 +730,7 @@ if test "x${ZLIB}" = "xyes"; then
GMSH_LIBS="${GMSH_LIBS} -lhdf5"
else
GMSH_LIBS="${GMSH_LIBS} -L${HDF5_PREFIX}/lib -lhdf5"
- FLAGS="${FLAGS} ${ISYM}${HDF5_PREFIX}/include"
+ FLAGS="${FLAGS} ${DASH}I${HDF5_PREFIX}/include"
fi
fi
fi
@@ -746,10 +746,10 @@ if test "x${HDF5}" = "xyes"; then
if test "x${MED}" = "xyes"; then
if test "x${MED_PREFIX}" = "x"; then
GMSH_LIBS="${GMSH_LIBS} -lmed"
- FLAGS="${FLAGS} ${DSYM}HAVE_MED"
+ FLAGS="${FLAGS} ${DASH}DHAVE_MED"
else
GMSH_LIBS="${GMSH_LIBS} -L${MED_PREFIX}/lib -lmed"
- FLAGS="${FLAGS} ${DSYM}HAVE_MED ${ISYM}${MED_PREFIX}/include"
+ FLAGS="${FLAGS} ${DASH}DHAVE_MED ${DASH}I${MED_PREFIX}/include"
fi
fi
fi
@@ -759,22 +759,22 @@ dnl Complete zlib link line (zlib must be linked in after libpng and libhdf5)
if test "x${ZLIB}" = "xyes"; then
dnl If provided by FLTK, use that one; otherwise, look for it
if test "x${FL_ZLIB}" = "xyes"; then
- FLAGS="${DSYM}HAVE_LIBZ ${FLAGS}"
+ FLAGS="${DASH}DHAVE_LIBZ ${FLAGS}"
else
- FLAGS="${DSYM}HAVE_LIBZ ${FLAGS}"
+ FLAGS="${DASH}DHAVE_LIBZ ${FLAGS}"
if test "x${ZLIB_PREFIX}" = "x"; then
GMSH_LIBS="${GMSH_LIBS} -lz"
else
dnl Find the libs/includes even if libz is _not_ properly installed (ugly hack!)
GMSH_LIBS="${GMSH_LIBS} -L${ZLIB_PREFIX} -L${ZLIB_PREFIX}/lib -lz"
- FLAGS="${FLAGS} ${ISYM}${ZLIB_PREFIX} ${ISYM}${ZLIB_PREFIX}/include"
+ FLAGS="${FLAGS} ${DASH}I${ZLIB_PREFIX} ${DASH}I${ZLIB_PREFIX}/include"
fi
fi
fi
dnl Check if we should build the parallel version
if test "x$enable_parallel" = "xyes"; then
- FLAGS="${DSYM}HAVE_PARALLEL ${FLAGS}"
+ FLAGS="${DASH}DHAVE_PARALLEL ${FLAGS}"
fi
dnl Finish link line
@@ -851,7 +851,7 @@ if test $ac_cv_sizeof_size_t != 4; then
if test $ac_cv_sizeof_size_t != 8; then
AC_MSG_WARN([Unsupported size of size_t - this may affect FNV hashing.])
else
- FLAGS="$FLAGS ${DSYM}HAVE_64BIT_SIZE_T"
+ FLAGS="$FLAGS ${DASH}DHAVE_64BIT_SIZE_T"
fi
fi
@@ -867,9 +867,7 @@ AC_SUBST(AR)
AC_SUBST(ARFLAGS)
AC_SUBST(OBJEXT)
AC_SUBST(LIBEXT)
-AC_SUBST(ISYM)
-AC_SUBST(CSYM)
-AC_SUBST(DSYM)
+AC_SUBST(DASH)
AC_SUBST(SYSINCLUDE)
AC_OUTPUT(variables)
diff --git a/contrib/NR/Makefile b/contrib/NR/Makefile
index 239304dc13583ed06dd3e563329b638615c14fa1..2fbfee136038dec58ba3158cd5d85657ae844942 100644
--- a/contrib/NR/Makefile
+++ b/contrib/NR/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.6 2008-01-18 20:41:33 geuzaine Exp $
+# $Id: Makefile,v 1.7 2008-01-18 21:00:40 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
@@ -22,7 +22,7 @@
include ../../variables
LIB = ../../lib/libGmshNR${LIBEXT}
-INCLUDE = ${ISYM}../../Common ${ISYM}../../DataStr ${ISYM}../../Numeric
+INCLUDE = ${DASH}I../../Common ${DASH}I../../DataStr ${DASH}I../../Numeric
# don't optimize this library: there are some problems with gcc...
CFLAGS = ${FLAGS} ${INCLUDE} ${SYSINCLUDE}
@@ -47,7 +47,7 @@ ${LIB}: ${OBJ}
${RANLIB} ${LIB}
.cpp${OBJEXT}:
- ${CXX} ${CFLAGS} ${CSYM} $<
+ ${CXX} ${CFLAGS} ${DASH}c $<
clean:
rm -f *${OBJEXT}
diff --git a/contrib/Tetgen/Makefile b/contrib/Tetgen/Makefile
index 14beefce5b7391e6254aa74230b9457e6ecda77f..fe0a24da5cc7b82f29bb53e1e9fadeded33fe4dd 100644
--- a/contrib/Tetgen/Makefile
+++ b/contrib/Tetgen/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.7 2008-01-18 20:41:33 geuzaine Exp $
+# $Id: Makefile,v 1.8 2008-01-18 21:00:41 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
@@ -23,7 +23,7 @@ include ../../variables
LIB = ../../lib/libGmshTetgen${LIBEXT}
# Do not optimize (same as Triangle...)
-CFLAGS = ${FLAGS} ${DSYM}TETLIBRARY
+CFLAGS = ${FLAGS} ${DASH}DTETLIBRARY
SRC = predicates.cxx tetgen.cxx
OBJ = ${SRC:.cxx=${OBJEXT}}
@@ -35,7 +35,7 @@ ${LIB}: ${OBJ}
${RANLIB} ${LIB}
.cxx${OBJEXT}:
- ${CXX} ${CFLAGS} ${CSYM} $<
+ ${CXX} ${CFLAGS} ${DASH}c $<
clean:
rm -f *${OBJEXT}
diff --git a/variables.in b/variables.in
index e665704e79fab6f2e186e796f12c7b93df359aae..36c2101009d0610491604c7ba62d11cfd40a062f 100644
--- a/variables.in
+++ b/variables.in
@@ -1,4 +1,4 @@
-# $Id: variables.in,v 1.22 2008-01-18 20:41:33 geuzaine Exp $
+# $Id: variables.in,v 1.23 2008-01-18 21:00:39 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
@@ -54,10 +54,8 @@ AR=@AR@
ARFLAGS=@ARFLAGS@
RANLIB=@RANLIB@
-# The symbols used for includes and compiling
-ISYM=@ISYM@
-CSYM=@CSYM@
-DSYM=@DSYM@
+# The symbol used in front of compiler flags
+DASH=@DASH@
# The extension to use for object files, libraries and executables
OBJEXT=@OBJEXT@