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

vc++ fix

parent a4239591
No related branches found
No related tags found
No related merge requests found
# $Id: Makefile,v 1.21 2008-01-18 20:13:13 geuzaine Exp $ # $Id: Makefile,v 1.22 2008-01-19 00:24:34 geuzaine Exp $
# #
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle # Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
# #
...@@ -21,9 +21,10 @@ ...@@ -21,9 +21,10 @@
include ../../variables include ../../variables
LIB = ../../lib/libGmshNetgen.a LIB = ../../lib/libGmshNetgen${LIBEXT}
INCLUDE = -I../../Common -Ilibsrc/include -Ilibsrc/interface INCLUDE = ${DASH}I../../Common ${DASH}Ilibsrc/include ${DASH}Ilibsrc/interface
CFLAGS = ${OPTIM} ${FLAGS} ${INCLUDE} -DNO_PARALLEL_THREADS -UWIN32 CFLAGS = ${OPTIM} ${FLAGS} ${INCLUDE} ${SYSINCLUDE}\
${DASH}DNO_PARALLEL_THREADS ${DASH}UWIN32
SRC = libsrc/opti/linopt.cpp \ SRC = libsrc/opti/linopt.cpp \
libsrc/opti/bfgs.cpp \ libsrc/opti/bfgs.cpp \
...@@ -125,19 +126,19 @@ SRC = libsrc/opti/linopt.cpp \ ...@@ -125,19 +126,19 @@ SRC = libsrc/opti/linopt.cpp \
libsrc/general/mystring.cpp \ libsrc/general/mystring.cpp \
nglib_addon.cpp nglib_addon.cpp
OBJ = ${SRC:.cpp=.o} OBJ = ${SRC:.cpp=${OBJEXT}}
.SUFFIXES: .o .cpp .SUFFIXES: ${OBJEXT} .cpp
${LIB}: ${OBJ} ${LIB}: ${OBJ}
${AR} ${LIB} ${OBJ} ${AR} ${ARFLAGS}${LIB} ${OBJ}
${RANLIB} ${LIB} ${RANLIB} ${LIB}
.cpp.o: .cpp${OBJEXT}:
${CXX} ${CFLAGS} -c $< -o ${<:.cpp=.o} ${CXX} ${CFLAGS} ${DASH}c $< ${DASH}o ${<:.cpp=.obj}
clean: clean:
rm -f *.o libsrc/*/*.o rm -f *${OBJEXT} libsrc/*/*${OBJEXT}
depend: depend:
(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \ (sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment