From 4e8b6636390dcce00554171669c8e84b41bbf522 Mon Sep 17 00:00:00 2001
From: Claudine Bon <claudine.bon@samtech.com>
Date: Thu, 5 Jun 2008 14:26:09 +0000
Subject: [PATCH] mods for VC2005
---
DataStr/Makefile | 4 +-
Parser/Makefile | 4 +-
contrib/NR/Makefile | 4 +-
utils/misc/variables.msvc_samcef | 65 --------------------------------
4 files changed, 6 insertions(+), 71 deletions(-)
delete mode 100755 utils/misc/variables.msvc_samcef
diff --git a/DataStr/Makefile b/DataStr/Makefile
index 89038b198a..ca06e70a19 100644
--- a/DataStr/Makefile
+++ b/DataStr/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.49 2008-06-05 13:58:43 geuzaine Exp $
+# $Id: Makefile,v 1.50 2008-06-05 14:26:09 samtech Exp $
#
# Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
#
@@ -23,7 +23,7 @@ include ../variables
LIB = ../lib/libGmshDataStr${LIBEXT}
-INC = ${DASH}I../Common
+INC = ${DASH}I../DataStr ${DASH}I../Common
CFLAGS = ${OPTIM} ${FLAGS} ${INC} ${SYSINCLUDE}
diff --git a/Parser/Makefile b/Parser/Makefile
index ebbf717120..e89ab60705 100644
--- a/Parser/Makefile
+++ b/Parser/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.156 2008-06-05 13:58:44 geuzaine Exp $
+# $Id: Makefile,v 1.157 2008-06-05 14:26:09 samtech Exp $
#
# Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
#
@@ -23,7 +23,7 @@ include ../variables
LIB = ../lib/libGmshParser${LIBEXT}
-INC = ${DASH}I../Common ${DASH}I../DataStr ${DASH}I../Geo ${DASH}I../Mesh\
+INC = ${DASH}I../Parser ${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../contrib/ANN/include
diff --git a/contrib/NR/Makefile b/contrib/NR/Makefile
index df1a11f584..0f095f809c 100644
--- a/contrib/NR/Makefile
+++ b/contrib/NR/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.13 2008-04-23 23:00:40 geuzaine Exp $
+# $Id: Makefile,v 1.14 2008-06-05 14:26:09 samtech Exp $
#
# Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
#
@@ -23,7 +23,7 @@ include ../../variables
LIB = ../../lib/libGmshNR${LIBEXT}
-INC = ${DASH}I../../Common ${DASH}I../../DataStr ${DASH}I../../Numeric
+INC = ${DASH}I../NR ${DASH}I../../Common ${DASH}I../../DataStr ${DASH}I../../Numeric
# don't optimize this library: there are some problems with gcc...
CFLAGS = ${FLAGS} ${INC} ${SYSINCLUDE}
diff --git a/utils/misc/variables.msvc_samcef b/utils/misc/variables.msvc_samcef
deleted file mode 100755
index d091cf50b6..0000000000
--- a/utils/misc/variables.msvc_samcef
+++ /dev/null
@@ -1,65 +0,0 @@
-# This is a pre-filled variables file for building a blackbox version
-# of Gmsh with Microsoft Visual C++ (MSVC).
-#
-# This has been tested with MSVC 2003 and MSVC 2008. See
-# doc/README.msvc for building instructions.
-
-# OS and host
-UNAME=WIN32MSVC
-HOSTNAME=localhost
-
-# The names of the C and C++ compilers
-CC=cl
-CXX=cl /EHsc /nologo /GR /MT
-
-# Use /MLd for single-thread debug mode
-# /MTd for multi-thread debug mode
-# /MT for multi-thread release mode
-
-# increase stack size to 16Mb to avoid stack overflows in recursive
-# tet classification for large 3D Delaunay grids
-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_NO_POST /DHAVE_OCC /DWNT /IC:/OpenCascade6.2.0/ros/inc
-
-# Additional system includes ($INCLUDE is automatically defined by MSVC when
-# you launch the MSVC command prompt)
-SYSINCLUDE=/I"${INCLUDE}"
-
-# Compiler optimization flags
-OPTIM=/O2
-
-# Gmsh subdirectories
-GMSH_DIRS=Common DataStr Geo Mesh Numeric Parser contrib/NR
-
-# Gmsh libraries
-
-
-OCC_LIBS="-lTKSTEP -lTKSTEP209 -lTKSTEPAttr -lTKSTEPBase -lTKIGES -lTKXSBase -lTKOffset -lTKFeat -lTKFillet -lTKBool -lTKShHealing -lTKMesh -lTKHLR -lTKBO -lTKPrim -lTKTopAlgo -lTKGeomAlgo -lTKBRep -lTKGeomBase -lTKG3d -lTKG2d -lTKAdvTools -lTKMath -lTKernel"
-
-GMSH_LIBS=Common/Main.obj lib/*.lib
-
-# How you create a static library on this machine
-AR=LIB
-ARFLAGS=/OUT:
-RANLIB=true
-
-# The symbol used in front of compiler flags
-DASH=/
-
-# The extension to use for object files, libraries and executables
-OBJEXT=.obj
-LIBEXT=.lib
-EXEEXT=.exe
-
-# Installation directories
-prefix="S:\Lib\gmsh"
-exec_prefix=${prefix}
-bindir=${exec_prefix}/bin
-datadir=${datarootdir}
-datarootdir=${prefix}/share
-includedir=${prefix}/include
-libdir=${exec_prefix}/lib
-mandir=${datarootdir}/man
-infodir=${datarootdir}/info
--
GitLab