From 8ecae2762e80dafd68373763ffc27e73994b4f01 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Tue, 23 Sep 2008 20:53:26 +0000
Subject: [PATCH] *** empty log message ***
---
contrib/Netgen/Makefile | 20 ++++++++++++++++++--
contrib/Netgen/libsrc/makefile.inc | 4 +++-
utils/misc/variables.msvc | 3 ++-
3 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/contrib/Netgen/Makefile b/contrib/Netgen/Makefile
index 611cba8da7..1bf956cbd3 100644
--- a/contrib/Netgen/Makefile
+++ b/contrib/Netgen/Makefile
@@ -13,11 +13,21 @@ CFLAGS = ${OPTIM} ${FLAGS} ${INC} ${SYSINCLUDE}\
${DASH}DNO_PARALLEL_THREADS ${DASH}UWIN32
${LIB}: recur nglib_addon${OBJEXT}
+ifneq (${UNAME},WIN32MSVC)
${AR} ${ARFLAGS}${LIB} *${OBJEXT} libsrc/*/*${OBJEXT}
+else
+ copy libsrc\linalg\*.obj
+ copy libsrc\general\*.obj
+ copy libsrc\gprim\*.obj
+ copy libsrc\meshing\*.obj
+ copy libsrc\opti\*.obj
+ copy libsrc\interface\*.obj
+ ${AR} ${ARFLAGS}${LIB} *${OBJEXT}
+endif
${RANLIB} ${LIB}
cpobj: recur nglib_addon${OBJEXT}
- ${CP} *${OBJEXT} libsrc/*/*${OBJEXT} ../../lib/
+ cp -f *${OBJEXT} libsrc/*/*${OBJEXT} ../../lib/
recur:
@cd libsrc/linalg && ${MAKE}
@@ -31,7 +41,13 @@ nglib_addon${OBJEXT}:
${CXX} ${CFLAGS} ${DASH}c nglib_addon.cpp
clean:
- rm -f *.o *.obj libsrc/*/*.o libsrc/*/*.obj
+ @cd libsrc/linalg && ${MAKE} clean
+ @cd libsrc/general && ${MAKE} clean
+ @cd libsrc/gprim && ${MAKE} clean
+ @cd libsrc/meshing && ${MAKE} clean
+ @cd libsrc/opti && ${MAKE} clean
+ @cd libsrc/interface && ${MAKE} clean
+ ${RM} *.o *.obj
depend:
true
diff --git a/contrib/Netgen/libsrc/makefile.inc b/contrib/Netgen/libsrc/makefile.inc
index ab004306c0..7fb7d946c7 100644
--- a/contrib/Netgen/libsrc/makefile.inc
+++ b/contrib/Netgen/libsrc/makefile.inc
@@ -11,8 +11,10 @@ OBJ = ${src:.cpp=${OBJEXT}}
.SUFFIXES: ${OBJEXT} .cpp
-default: ${OBJ}
+default: ${OBJ}
.cpp${OBJEXT}:
${CXX} ${CFLAGS} ${DASH}c $<
+clean:
+ ${RM} *.o *.obj
diff --git a/utils/misc/variables.msvc b/utils/misc/variables.msvc
index a398a8795f..cd20c3c8a1 100644
--- a/utils/misc/variables.msvc
+++ b/utils/misc/variables.msvc
@@ -18,7 +18,7 @@ ENABLE_PARSER=1
ENABLE_POSTPRO=1
ENABLE_TETGEN=1
ENABLE_NETGEN=0
-ENABLE_METIS=1
+ENABLE_METIS=0
ENABLE_OCC=0
ENABLE_MED=0
@@ -147,6 +147,7 @@ EXEEXT=.exe
# File handling commands
RM=erase
+MV=move
# Installation directories
prefix="S:\Lib\gmsh"
--
GitLab