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

replace INCLUDE var in makefiles so that we can have a generic variables.msvc

parent c7ec9964
No related branches found
No related tags found
No related merge requests found
# $Id: Makefile,v 1.44 2008-01-23 07:45:27 geuzaine Exp $
# $Id: Makefile,v 1.45 2008-02-07 21:29:38 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
......@@ -22,11 +22,13 @@
include ../variables
LIB = ../lib/libGmshBox${LIBEXT}
INCLUDE = ${DASH}I../Common ${DASH}I../DataStr ${DASH}I../Geo ${DASH}I../Mesh\
INC = ${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}
CFLAGS = ${OPTIM} ${FLAGS} ${INC} ${SYSINCLUDE}
SRC = Box.cpp
......
# $Id: Makefile,v 1.155 2008-01-23 07:45:27 geuzaine Exp $
# $Id: Makefile,v 1.156 2008-02-07 21:29:38 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
......@@ -22,11 +22,13 @@
include ../variables
LIB = ../lib/libGmshCommon${LIBEXT}
INCLUDE = ${DASH}I../Common ${DASH}I../DataStr ${DASH}I../Geo ${DASH}I../Mesh\
INC = ${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}
CFLAGS = ${OPTIM} ${FLAGS} ${INC} ${SYSINCLUDE}
SRC = Context.cpp\
Octree.cpp OctreeInternals.cpp\
......
# $Id: Makefile,v 1.43 2008-01-23 07:45:27 geuzaine Exp $
# $Id: Makefile,v 1.44 2008-02-07 21:29:38 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
......@@ -22,8 +22,10 @@
include ../variables
LIB = ../lib/libGmshDataStr${LIBEXT}
INCLUDE = ${DASH}I../Common
CFLAGS = ${OPTIM} ${FLAGS} ${INCLUDE} ${SYSINCLUDE}
INC = ${DASH}I../Common
CFLAGS = ${OPTIM} ${FLAGS} ${INC} ${SYSINCLUDE}
SRC = List.cpp \
Malloc.cpp \
......
# $Id: Makefile,v 1.167 2008-01-23 07:45:28 geuzaine Exp $
# $Id: Makefile,v 1.168 2008-02-07 21:29:39 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
......@@ -22,11 +22,13 @@
include ../variables
LIB = ../lib/libGmshFltk${LIBEXT}
INCLUDE = ${DASH}I../Common ${DASH}I../DataStr ${DASH}I../Graphics\
INC = ${DASH}I../Common ${DASH}I../DataStr ${DASH}I../Graphics\
${DASH}I../Geo ${DASH}I../Mesh ${DASH}I../Post ${DASH}I../Numeric\
${DASH}I../Parser ${DASH}I../Fltk ${DASH}I../Plugin ${DASH}I../utils/solvers\
${DASH}I../contrib/ANN/include ${DASH}I../contrib/NativeFileChooser
CFLAGS = ${OPTIM} ${FLAGS} ${INCLUDE} ${SYSINCLUDE}
CFLAGS = ${OPTIM} ${FLAGS} ${INC} ${SYSINCLUDE}
SRC = Main.cpp \
Message.cpp \
......
# $Id: Makefile,v 1.181 2008-02-05 18:58:04 geuzaine Exp $
# $Id: Makefile,v 1.182 2008-02-07 21:29:39 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
......@@ -22,11 +22,13 @@
include ../variables
LIB = ../lib/libGmshGeo${LIBEXT}
INCLUDE = ${DASH}I../Common ${DASH}I../DataStr ${DASH}I../Geo ${DASH}I../Mesh\
INC = ${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}
CFLAGS = ${OPTIM} ${FLAGS} ${INC} ${SYSINCLUDE}
SRC = GEntity.cpp\
GVertex.cpp GEdge.cpp GEdgeLoop.cpp GFace.cpp GRegion.cpp\
......
# $Id: Makefile,v 1.137 2008-01-23 07:45:28 geuzaine Exp $
# $Id: Makefile,v 1.138 2008-02-07 21:29:39 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
......@@ -22,11 +22,13 @@
include ../variables
LIB = ../lib/libGmshGraphics${LIBEXT}
INCLUDE = ${DASH}I../Common ${DASH}I../DataStr ${DASH}I../Geo ${DASH}I../Mesh\
INC = ${DASH}I../Common ${DASH}I../DataStr ${DASH}I../Geo ${DASH}I../Mesh\
${DASH}I../Post ${DASH}I../Graphics ${DASH}I../Fltk ${DASH}I../Numeric\
${DASH}I../Parser ${DASH}I../Plugin ${DASH}I../contrib/MathEval\
${DASH}I../contrib/ANN/include
CFLAGS = ${OPTIM} ${FLAGS} ${INCLUDE} ${SYSINCLUDE}
CFLAGS = ${OPTIM} ${FLAGS} ${INC} ${SYSINCLUDE}
SRC = Draw.cpp \
Mesh.cpp \
......
# $Id: Makefile,v 1.201 2008-02-05 18:58:04 geuzaine Exp $
# $Id: Makefile,v 1.202 2008-02-07 21:29:39 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
......@@ -22,7 +22,8 @@
include ../variables
LIB = ../lib/libGmshMesh${LIBEXT}
INCLUDE = ${DASH}I../Numeric ${DASH}I../Common ${DASH}I../DataStr ${DASH}I../Geo\
INC = ${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\
......@@ -30,7 +31,8 @@ INCLUDE = ${DASH}I../Numeric ${DASH}I../Common ${DASH}I../DataStr ${DASH}I../Geo
${DASH}I../contrib/Netgen/libsrc/interface\
${DASH}I../contrib/ANN/include ${DASH}I../contrib/Metis\
${DASH}I../contrib/MathEval
CFLAGS = ${OPTIM} ${FLAGS} ${INCLUDE} ${SYSINCLUDE}
CFLAGS = ${OPTIM} ${FLAGS} ${INC} ${SYSINCLUDE}
SRC = Generator.cpp \
Field.cpp\
......@@ -68,7 +70,7 @@ ${LIB}: ${OBJ}
# Don't optimize BDS: it crashes with some flavors of gcc 4.1 (e.g. on debian etch)
BDS.o:
${CXX} ${FLAGS} ${INCLUDE} ${SYSINCLUDE} ${DASH}c BDS.cpp
${CXX} ${FLAGS} ${INC} ${SYSINCLUDE} ${DASH}c BDS.cpp
clean:
rm -f *.o *.obj
......
# $Id: Makefile,v 1.45 2008-01-23 07:45:29 geuzaine Exp $
# $Id: Makefile,v 1.46 2008-02-07 21:29:39 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
......@@ -22,8 +22,10 @@
include ../variables
LIB = ../lib/libGmshNumeric${LIBEXT}
INCLUDE = ${DASH}I../Common ${DASH}I../DataStr ${DASH}I../Numeric ${DASH}I../contrib/NR
CFLAGS = ${OPTIM} ${FLAGS} ${INCLUDE} ${SYSINCLUDE}
INC = ${DASH}I../Common ${DASH}I../DataStr ${DASH}I../Numeric ${DASH}I../contrib/NR
CFLAGS = ${OPTIM} ${FLAGS} ${INC} ${SYSINCLUDE}
SRC = Numeric.cpp\
NumericEmbedded.cpp\
......
# $Id: Makefile,v 1.41 2008-01-23 07:45:29 geuzaine Exp $
# $Id: Makefile,v 1.42 2008-02-07 21:29:39 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
......@@ -22,8 +22,10 @@
include ../variables
LIB = ../lib/libGmshParallel${LIBEXT}
INCLUDE = ${DASH}I../Common ${DASH}I../DataStr
CFLAGS = ${OPTIM} ${FLAGS} ${INCLUDE} ${SYSINCLUDE}
INC = ${DASH}I../Common ${DASH}I../DataStr
CFLAGS = ${OPTIM} ${FLAGS} ${INC} ${SYSINCLUDE}
SRC = ParUtil.cpp
......
# $Id: Makefile,v 1.138 2008-01-23 07:45:29 geuzaine Exp $
# $Id: Makefile,v 1.139 2008-02-07 21:29:39 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
......@@ -22,10 +22,12 @@
include ../variables
LIB = ../lib/libGmshParser${LIBEXT}
INCLUDE = ${DASH}I../Common ${DASH}I../DataStr ${DASH}I../Geo ${DASH}I../Mesh\
INC = ${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}
CFLAGS = ${OPTIM} ${FLAGS} ${INC} ${SYSINCLUDE}
SRC = Gmsh.tab.cpp\
Gmsh.yy.cpp\
......@@ -47,7 +49,7 @@ ${LIB}: ${OBJ}
# Don't optimize Gmsh.tab.o: on many architectures, g++ -O2 generates
# assembly code too large to be addressed correctly
Gmsh.tab${OBJEXT}:
${CXX} ${FLAGS} ${INCLUDE} ${SYSINCLUDE} ${DASH}c Gmsh.tab.cpp
${CXX} ${FLAGS} ${INC} ${SYSINCLUDE} ${DASH}c Gmsh.tab.cpp
parser:
bison -p gmsh_yy --output Gmsh.tab.cpp -d Gmsh.y
......
# $Id: Makefile,v 1.148 2008-02-05 19:02:39 geuzaine Exp $
# $Id: Makefile,v 1.149 2008-02-07 21:29:40 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
......@@ -22,11 +22,13 @@
include ../variables
LIB = ../lib/libGmshPlugin${LIBEXT}
INCLUDE = ${DASH}I../Common ${DASH}I../Graphics ${DASH}I../DataStr ${DASH}I../Geo\
INC = ${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}
CFLAGS = ${OPTIM} ${FLAGS} ${INC} ${SYSINCLUDE}
SRC = Plugin.cpp PluginManager.cpp\
Levelset.cpp\
......
# $Id: Makefile,v 1.26 2008-01-23 07:45:30 geuzaine Exp $
# $Id: Makefile,v 1.27 2008-02-07 21:29:40 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
......@@ -22,11 +22,13 @@
include ../variables
LIB = ../lib/libGmshPost${LIBEXT}
INCLUDE = ${DASH}I../Common ${DASH}I../DataStr ${DASH}I../Geo ${DASH}I../Mesh\
INC = ${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}
CFLAGS =${OPTIM} ${FLAGS} ${INC} ${SYSINCLUDE}
SRC = PView.cpp\
PViewData.cpp\
......
# $Id: Makefile,v 1.19 2008-01-23 07:45:30 geuzaine Exp $
# $Id: Makefile,v 1.20 2008-02-07 21:29:40 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
......@@ -22,8 +22,10 @@
include ../../variables
LIB = ../../lib/libGmshANN${LIBEXT}
INCLUDE = ${DASH}I../../Common ${DASH}I./include
CFLAGS = ${OPTIM} ${FLAGS} ${INCLUDE} ${SYSINCLUDE}
INC = ${DASH}I../../Common ${DASH}I./include
CFLAGS = ${OPTIM} ${FLAGS} ${INC} ${SYSINCLUDE}
SRC = src/ANN.cpp\
src/bd_fix_rad_search.cpp\
......
# $Id: Makefile,v 1.18 2008-01-23 07:45:30 geuzaine Exp $
# $Id: Makefile,v 1.19 2008-02-07 21:29:40 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
......@@ -22,9 +22,10 @@
include ../../variables
LIB = ../../lib/libGmshMathEval${LIBEXT}
INCLUDE = ${DASH}I../../Common ${DASH}I../../DataStr
CFLAGS = ${OPTIM} ${FLAGS} ${INCLUDE} ${SYSINCLUDE}
INC = ${DASH}I../../Common ${DASH}I../../DataStr
CFLAGS = ${OPTIM} ${FLAGS} ${INC} ${SYSINCLUDE}
SRC = matheval.cpp\
node.cpp\
......
# $Id: Makefile,v 1.14 2008-01-23 07:45:30 geuzaine Exp $
# $Id: Makefile,v 1.15 2008-02-07 21:29:40 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
......@@ -22,8 +22,10 @@
include ../../variables
LIB = ../../lib/libGmshMetis.a
INCLUDE = -I.
CFLAGS = ${OPTIM} ${FLAGS} ${INCLUDE}
INC = ${DASH}I.
CFLAGS = ${OPTIM} ${FLAGS} ${INC} ${SYSINCLUDE}
SRC = balance.c \
fm.c \
......@@ -78,16 +80,19 @@ SRC = balance.c \
parmetis.c \
stat.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 $< -o ${<:.c=.o}
.c${OBJEXT}:
${CC} ${CFLAGS} ${DASH}c $< ${DASH}o ${<:.c=${OBJEXT}}
if [ -r ${notdir ${<:.c=${OBJEXT}}} ]; then\
mv -f ${notdir ${<:.c=${OBJEXT}}} ${<:.c=${OBJEXT}};\
fi
clean:
rm -f *.o *.obj
......
# $Id: Makefile,v 1.9 2008-01-23 07:45:30 geuzaine Exp $
# $Id: Makefile,v 1.10 2008-02-07 21:29:40 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
......@@ -22,9 +22,11 @@
include ../../variables
LIB = ../../lib/libGmshNR${LIBEXT}
INCLUDE = ${DASH}I../../Common ${DASH}I../../DataStr ${DASH}I../../Numeric
INC = ${DASH}I../../Common ${DASH}I../../DataStr ${DASH}I../../Numeric
# don't optimize this library: there are some problems with gcc...
CFLAGS = ${FLAGS} ${INCLUDE} ${SYSINCLUDE}
CFLAGS = ${FLAGS} ${INC} ${SYSINCLUDE}
SRC = brent.cpp\
dpythag.cpp\
......
# $Id: Makefile,v 1.4 2008-01-23 07:45:30 geuzaine Exp $
# $Id: Makefile,v 1.5 2008-02-07 21:29:40 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
......@@ -22,8 +22,10 @@
include ../../variables
LIB = ../../lib/libGmshNativeFileChooser${LIBEXT}
INCLUDE = ${DASH}I.
CFLAGS = ${OPTIM} ${FLAGS} ${INCLUDE} ${SYSINCLUDE} ${DASH}DFLTK1
INC = ${DASH}I.
CFLAGS = ${OPTIM} ${FLAGS} ${INC} ${SYSINCLUDE} ${DASH}DFLTK1
SRC = Fl_Native_File_Chooser.cxx
OBJ = ${SRC:.cxx=${OBJEXT}}
......@@ -34,7 +36,7 @@ ${LIB}: ${OBJ}
${AR} ${ARFLAGS}${LIB} ${OBJ}
${RANLIB} ${LIB}
.cxx.o:
.cxx${OBJEXT}:
${CXX} ${CFLAGS} ${DASH}c $<
clean:
......
# $Id: Makefile,v 1.28 2008-01-23 07:45:30 geuzaine Exp $
# $Id: Makefile,v 1.29 2008-02-07 21:29:41 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
......@@ -22,8 +22,10 @@
include ../../variables
LIB = ../../lib/libGmshNetgen${LIBEXT}
INCLUDE = ${DASH}I../../Common ${DASH}Ilibsrc/include ${DASH}Ilibsrc/interface
CFLAGS = ${OPTIM} ${FLAGS} ${INCLUDE} ${SYSINCLUDE}\
INC = ${DASH}I../../Common ${DASH}Ilibsrc/include ${DASH}Ilibsrc/interface
CFLAGS = ${OPTIM} ${FLAGS} ${INC} ${SYSINCLUDE}\
${DASH}DNO_PARALLEL_THREADS ${DASH}UWIN32
SRC = libsrc/opti/linopt.cpp \
......
# $Id: Makefile,v 1.9 2008-01-23 07:45:31 geuzaine Exp $
# $Id: Makefile,v 1.10 2008-02-07 21:29:41 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
......@@ -22,6 +22,7 @@
include ../../variables
LIB = ../../lib/libGmshTetgen${LIBEXT}
# Do not optimize (same as Triangle...)
CFLAGS = ${FLAGS} ${DASH}DTETLIBRARY
......
# This is a pre-filled variables file for building a blackbox version
# of Gmsh with Microsoft Visual C++ 2008. See doc/README.msvc for
# building instructions.
# of Gmsh with Microsoft Visual C++ (MSVC).
#
# This has been tested with MSVC 2003.NET and MSVC 2008.
# See doc/README.msvc for building instructions.
# OS and host
UNAME=WIN32MSVC
......@@ -9,11 +11,8 @@ HOSTNAME=localhost
# The names of the C and C++ compilers
CC=cl
CXX=cl /EHsc /nologo /GR
#MLd --> Single Thread debug ok?
#MTd--> Multit hread debug
# Add /MLd for single-thread debug mode
# /MTd for multi-thread debug mode
# increase stack size to 16Mb to avoid stack overflows in recursive
# tet classification for large 3D Delaunay grids
......@@ -22,10 +21,9 @@ LINKER=cl /F16777216
# All compiler flags except optimization flags
FLAGS=/DWIN32 /D_USE_MATH_DEFINES /DHAVE_NO_DLL /DHAVE_NO_VSNPRINTF /DHAVE_NO_SNPRINTF /DHAVE_NO_SOCKLEN_T /DHAVE_ANN /DHAVE_MATH_EVAL /DHAVE_NETGEN /DHAVE_TETGEN
# Additional system includes
#SYSINCLUDE=/I"C:\Program Files\Microsoft Visual Studio 9.0\VC\INCLUDE" /I"C:\Program Files\Microsoft SDKs\Windows\v6.0A\include"
SYSINCLUDE=/I"C:\Program Files\Microsoft Visual Studio .NET 2003\VC7\INCLUDE" /I"C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\PlatformSDK\Include"
# Additional system includes ($INCLUDE is automatically defined by MSVC when
# you launch the MSVC command prompt)
SYSINCLUDE=/I"${INCLUDE}"
# Compiler optimization flags
OPTIM=/O2
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment