diff --git a/contrib/Netgen/Makefile b/contrib/Netgen/Makefile index 611cba8da79d5c5da5636e5389f0675c64fe6d79..1bf956cbd3fed1825db8cea782cc29907dd2773d 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 ab004306c01023442442ec723612b2fd15e184bc..7fb7d946c7cdd204471dd94b145fcbc85ceaaba4 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 a398a8795f6dc9409354f31ac842c4c7141e6208..cd20c3c8a1e5c607d9d6b31adb172ba37f75248d 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"