From b13756a9b18886448ff1a39526a5807839f0f726 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Thu, 13 Jan 2005 23:39:10 +0000
Subject: [PATCH] don't include GmshClient

---
 Fltk/Makefile    | 19 +++++++++----------
 Fltk/Solvers.cpp | 18 ++++++++++++++++--
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/Fltk/Makefile b/Fltk/Makefile
index 1ba5d8af3f..cdd3886d44 100644
--- a/Fltk/Makefile
+++ b/Fltk/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.66 2005-01-08 20:15:11 geuzaine Exp $
+# $Id: Makefile,v 1.67 2005-01-13 23:39:10 geuzaine Exp $
 #
 # Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
 #
@@ -153,12 +153,11 @@ Colorbar_Window.o: Colorbar_Window.cpp ../Common/Gmsh.h \
 GmshServer.o: GmshServer.cpp ../Common/Context.h ../DataStr/List.h
 Solvers.o: Solvers.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../utils/solvers/GmshClient.h \
-  GmshServer.h ../Parser/OpenFile.h Solvers.h ../Common/GmshUI.h GUI.h \
-  Opengl_Window.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h \
-  ../Mesh/Simplex.h ../Mesh/Face.h ../Mesh/Edge.h ../Geo/ExtrudeParams.h \
-  ../Mesh/DiscreteSurface.h ../Common/VertexArray.h \
-  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Matrix.h \
-  Colorbar_Window.h ../Common/ColorTable.h ../Graphics/Draw.h \
-  ../Common/Views.h ../Common/GmshMatrix.h ../Common/AdaptiveViews.h \
-  ../Common/Context.h
+  ../DataStr/avl.h ../DataStr/Tools.h GmshServer.h ../Parser/OpenFile.h \
+  Solvers.h ../Common/GmshUI.h GUI.h Opengl_Window.h ../Mesh/Mesh.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Simplex.h ../Mesh/Face.h \
+  ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/DiscreteSurface.h \
+  ../Common/VertexArray.h ../Common/SmoothNormals.h ../Mesh/Metric.h \
+  ../Mesh/Matrix.h Colorbar_Window.h ../Common/ColorTable.h \
+  ../Graphics/Draw.h ../Common/Views.h ../Common/GmshMatrix.h \
+  ../Common/AdaptiveViews.h ../Common/Context.h
diff --git a/Fltk/Solvers.cpp b/Fltk/Solvers.cpp
index 55aaac029e..c2d97b19f2 100644
--- a/Fltk/Solvers.cpp
+++ b/Fltk/Solvers.cpp
@@ -1,4 +1,4 @@
-// $Id: Solvers.cpp,v 1.31 2005-01-01 19:35:28 geuzaine Exp $
+// $Id: Solvers.cpp,v 1.32 2005-01-13 23:39:10 geuzaine Exp $
 //
 // Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
 //
@@ -20,9 +20,23 @@
 // Please report all bugs and problems to <gmsh@geuz.org>.
 
 #include "Gmsh.h"
-#include "GmshClient.h"
 #include "GmshServer.h"
 
+// This should match what's in GmshClient.h
+#define GMSH_CLIENT_START       1
+#define GMSH_CLIENT_STOP        2
+#define GMSH_CLIENT_INFO        10
+#define GMSH_CLIENT_WARNING     11
+#define GMSH_CLIENT_ERROR       12
+#define GMSH_CLIENT_PROGRESS    13
+#define GMSH_CLIENT_VIEW        20
+#define GMSH_CLIENT_OPTION      100
+#define GMSH_CLIENT_OPTION_1    (GMSH_CLIENT_OPTION+0)
+#define GMSH_CLIENT_OPTION_2    (GMSH_CLIENT_OPTION+1)
+#define GMSH_CLIENT_OPTION_3    (GMSH_CLIENT_OPTION+2)
+#define GMSH_CLIENT_OPTION_4    (GMSH_CLIENT_OPTION+3)
+#define GMSH_CLIENT_OPTION_5    (GMSH_CLIENT_OPTION+4)
+
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
-- 
GitLab