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

gcc 2.95 is still buggy...

parent dc28fd79
No related branches found
No related tags found
No related merge requests found
# $Id: Makefile,v 1.131 2001-08-15 10:03:33 geuzaine Exp $ # $Id: Makefile,v 1.132 2001-08-15 11:49:29 geuzaine Exp $
GMSH_RELEASE = 1.23 GMSH_RELEASE = 1.23
...@@ -259,7 +259,7 @@ link_linux: ...@@ -259,7 +259,7 @@ link_linux:
linux: tag compile_linux link_linux strip_bin linux: tag compile_linux link_linux strip_bin
# #
# Linux, gcc-2.95.x # Linux, gcc-2.95.x (optimized build is still buggy)
# #
compile_linux_gcc-2.95: compile_linux_gcc-2.95:
@for i in $(GMSH_FLTK_DIR); do (cd $$i && $(MAKE) \ @for i in $(GMSH_FLTK_DIR); do (cd $$i && $(MAKE) \
...@@ -270,6 +270,15 @@ compile_linux_gcc-2.95: ...@@ -270,6 +270,15 @@ compile_linux_gcc-2.95:
"GL_INCLUDE=-I/usr/X11R6/include" \ "GL_INCLUDE=-I/usr/X11R6/include" \
"GUI_INCLUDE=-I$(HOME)/SOURCES/fltk" \ "GUI_INCLUDE=-I$(HOME)/SOURCES/fltk" \
); done ); done
rm -f Mesh/3D_Extrude.o
@for i in $(GMSH_FLTK_DIR); do (cd $$i && $(MAKE) \
"CC=$(HOME)/gcc-2.95.3/bin/g++" \
"C_FLAGS=-O0" \
"OS_FLAGS=-D_LITTLE_ENDIAN" \
"VERSION_FLAGS=-D_FLTK" \
"GL_INCLUDE=-I/usr/X11R6/include" \
"GUI_INCLUDE=-I$(HOME)/SOURCES/fltk" \
); done
link_linux_gcc-2.95: link_linux_gcc-2.95:
$(HOME)/gcc-2.95.3/bin/g++ -o $(GMSH_BIN_DIR)/gmsh $(GMSH_FLTK_LIB) $(OPENGL_LIB) \ $(HOME)/gcc-2.95.3/bin/g++ -o $(GMSH_BIN_DIR)/gmsh $(GMSH_FLTK_LIB) $(OPENGL_LIB) \
-L$(HOME)/SOURCES/fltk/lib $(FLTK_LIB) -L/usr/X11R6/lib $(X11_LIB) -lm -ldl -L$(HOME)/SOURCES/fltk/lib $(FLTK_LIB) -L/usr/X11R6/lib $(X11_LIB) -lm -ldl
......
// $Id: 3D_Extrude.cpp,v 1.35 2001-08-15 08:16:30 geuzaine Exp $ // $Id: 3D_Extrude.cpp,v 1.36 2001-08-15 11:49:29 geuzaine Exp $
#include "Gmsh.h" #include "Gmsh.h"
#include "Numeric.h" #include "Numeric.h"
...@@ -748,9 +748,9 @@ void copy_mesh (Surface * from, Surface * to){ ...@@ -748,9 +748,9 @@ void copy_mesh (Surface * from, Surface * to){
} }
int Extrude_Mesh (Surface * s){ int Extrude_Mesh (Surface * s){
int i; int i, j;
Vertex *v1; Vertex *v1;
Curve *cc; Curve *c;
extern int FACE_DIMENSION; extern int FACE_DIMENSION;
if (!s->Extrude || !s->Extrude->mesh.ExtrudeMesh) return false; if (!s->Extrude || !s->Extrude->mesh.ExtrudeMesh) return false;
...@@ -766,29 +766,28 @@ int Extrude_Mesh (Surface * s){ ...@@ -766,29 +766,28 @@ int Extrude_Mesh (Surface * s){
ToAdd = s->Vertices; ToAdd = s->Vertices;
for (i = 0; i < List_Nbr (s->Generatrices); i++){ for (i = 0; i < List_Nbr (s->Generatrices); i++){
List_Read (s->Generatrices, i, &cc); List_Read (s->Generatrices, i, &c);
for (int j = 0; j < List_Nbr (cc->Vertices); j++){ for (j = 0; j < List_Nbr (c->Vertices); j++){
List_Read (cc->Vertices, j, &v1); List_Read (c->Vertices, j, &v1);
Tree_Insert (Vertex_Bound, &v1); Tree_Insert (Vertex_Bound, &v1);
} }
} }
if (ep->geo.Mode == EXTRUDED_ENTITY){ if (ep->geo.Mode == EXTRUDED_ENTITY){
Curve *c = FindCurve (abs(ep->geo.Source), THEM); c = FindCurve (abs(ep->geo.Source), THEM);
if (!c) return false; if (!c) return false;
for (i = 0; i < List_Nbr (c->Vertices); i++){ for (i = 0; i < List_Nbr (c->Vertices); i++){
List_Read (c->Vertices, i, &v1); List_Read (c->Vertices, i, &v1);
Extrude_Vertex (&v1, NULL); Extrude_Vertex (&v1, NULL);
} }
Extrude_Curve (&c, NULL); Extrude_Curve (&c, NULL);
return true;
} }
else{ else{
Surface *ss = FindSurface (ep->geo.Source, THEM); Surface *ss = FindSurface (ep->geo.Source, THEM);
if (!ss) return false; if (!ss) return false;
copy_mesh (ss, s); copy_mesh (ss, s);
return true;
} }
return true;
} }
static Tree_T* tmp; static Tree_T* tmp;
......
...@@ -35,3 +35,5 @@ Line Loop(25) = {-12,-4,8}; ...@@ -35,3 +35,5 @@ Line Loop(25) = {-12,-4,8};
Ruled Surface(26) = {25}; Ruled Surface(26) = {25};
Line Loop(27) = {-6,2,10}; Line Loop(27) = {-6,2,10};
Ruled Surface(28) = {27}; Ruled Surface(28) = {27};
Surface Loop(29) = {26,24,22,28,14,16,18,20};
Volume(30) = {29};
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment