From 2745138aad834f534a8a2b6100a40e99be6a09f6 Mon Sep 17 00:00:00 2001 From: Christophe Geuzaine <cgeuzaine@ulg.ac.be> Date: Thu, 1 Jul 2004 17:37:22 +0000 Subject: [PATCH] - set OLDCINCLUDE flag for netgen on sgi - use FLAGS in Netgen/Makefile --- Netgen/Makefile | 4 ++-- configure | 2 +- configure.in | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Netgen/Makefile b/Netgen/Makefile index fdc9b91495..986340c7e8 100644 --- a/Netgen/Makefile +++ b/Netgen/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.4 2004-06-30 21:15:58 geuzaine Exp $ +# $Id: Makefile,v 1.5 2004-07-01 17:37:22 geuzaine Exp $ # # Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle # @@ -23,7 +23,7 @@ include ../variables LIB = ../lib/libGmshNetgen.a INCLUDE = -I../Common -Ilibsrc/include -Ilibsrc/interface -CFLAGS = ${OPTIM} ${INCLUDE} -DNO_PARALLEL_THREADS +CFLAGS = ${OPTIM} ${FLAGS} ${INCLUDE} -DNO_PARALLEL_THREADS SRC = libsrc/opti/linopt.cpp \ libsrc/opti/bfgs.cpp \ diff --git a/configure b/configure index 4187882b6c..782fd554d7 100755 --- a/configure +++ b/configure @@ -3850,7 +3850,7 @@ case "$UNAME" in CXX="CC" CC="cc" OPTIM="-O2" - FLAGS="-mips3 -n32 -LANG:std -OPT:Olimit=0 ${FLAGS}" + FLAGS="-mips3 -n32 -LANG:std -OPT:Olimit=0 -DOLDCINCLUDE ${FLAGS}" AR="CC -mips3 -n32 -ar -o" LINKER="CC -O2 -mips3 -n32" ;; diff --git a/configure.in b/configure.in index ed2b49ff7b..172b397c89 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.54 2004-06-26 17:58:14 geuzaine Exp $ +dnl $Id: configure.in,v 1.55 2004-07-01 17:37:22 geuzaine Exp $ dnl dnl Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle dnl @@ -385,7 +385,8 @@ case "$UNAME" in CXX="CC" CC="cc" OPTIM="-O2" - FLAGS="-mips3 -n32 -LANG:std -OPT:Olimit=0 ${FLAGS}" + dnl -DOLDCINCLUDE is for Netgen + FLAGS="-mips3 -n32 -LANG:std -OPT:Olimit=0 -DOLDCINCLUDE ${FLAGS}" AR="CC -mips3 -n32 -ar -o" LINKER="CC -O2 -mips3 -n32" ;; -- GitLab