diff --git a/Makefile b/Makefile index e60c2da692694d58aafa6322c9ee12fa4e12c519..3df682188da464f72ffae9ce85b96621f62a6e44 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.196 2002-04-13 00:08:12 geuzaine Exp $ +# $Id: Makefile,v 1.197 2002-04-13 04:01:09 geuzaine Exp $ GMSH_MAJOR_VERSION = 1 GMSH_MINOR_VERSION = 35 @@ -481,11 +481,11 @@ compile-sgi: initialtag "OS_FLAGS=-mips3 -n32" \ "VERSION_FLAGS=-D_FLTK" \ "GL_INCLUDE=" \ - "GUI_INCLUDE=-I$(HOME)/SOURCES/fltk" \ + "GUI_INCLUDE=-I$(HOME)/SOURCES/fltk-1.1" \ ); done link-sgi: CC -O2 -mips3 -n32 -o $(GMSH_BIN_DIR)/gmsh $(GMSH_FLTK_LIB)\ - -L$(HOME)/SOURCES/fltk/lib $(FLTK_LIB) $(X11_LIB) $(OPENGL_LIB) -lm + -L$(HOME)/SOURCES/fltk-1.1/lib -lfltk_gl -lfltk $(X11_LIB) $(OPENGL_LIB) -lm sgi: compile-sgi link-sgi distrib-sgi: make tag diff --git a/Parallel/Makefile b/Parallel/Makefile index fb031842dfbae492842d933e594e43af7f90ba95..724ed33d79fdba908f26ea6ca95645a8631b1796 100644 --- a/Parallel/Makefile +++ b/Parallel/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.7 2001-12-16 05:16:37 remacle Exp $ +# $Id: Makefile,v 1.8 2002-04-13 04:01:09 geuzaine Exp $ # # Makefile for "libParallel.a" # @@ -15,6 +15,7 @@ OS_FLAGS = VERSION_FLAGS = RMFLAGS = -f +CFLAGS = $(OPT_FLAGS) $(OS_FLAGS) $(VERSION_FLAGS) $(INCLUDE) SRC = ParUtil.cpp