Skip to content
Snippets Groups Projects
Commit 25a6560e authored by Gaetan Bricteux's avatar Gaetan Bricteux
Browse files

fix compile for onelab & fltk1.1

parent a7c3aca9
No related branches found
No related tags found
No related merge requests found
...@@ -54,6 +54,9 @@ typedef unsigned long intptr_t; ...@@ -54,6 +54,9 @@ typedef unsigned long intptr_t;
#include "Generator.h" #include "Generator.h"
#include "HighOrder.h" #include "HighOrder.h"
#include "Field.h" #include "Field.h"
#if defined(HAVE_ONELAB)
#include "onelab.h"
#endif
static void file_new_cb(Fl_Widget *w, void *data) static void file_new_cb(Fl_Widget *w, void *data)
{ {
......
...@@ -7,6 +7,10 @@ ...@@ -7,6 +7,10 @@
#include "GmshConfig.h" #include "GmshConfig.h"
#include "GmshMessage.h" #include "GmshMessage.h"
#if defined(HAVE_ONELAB)
#include "onelab.h"
#endif
#if defined(HAVE_ONELAB) && (FL_MAJOR_VERSION == 1) && (FL_MINOR_VERSION == 3) #if defined(HAVE_ONELAB) && (FL_MAJOR_VERSION == 1) && (FL_MINOR_VERSION == 3)
#include <FL/Fl_Check_Button.H> #include <FL/Fl_Check_Button.H>
...@@ -30,7 +34,6 @@ ...@@ -30,7 +34,6 @@
#include "paletteWindow.h" #include "paletteWindow.h"
#include "menuWindow.h" #include "menuWindow.h"
#include "fileDialogs.h" #include "fileDialogs.h"
#include "onelab.h"
#include "onelabWindow.h" #include "onelabWindow.h"
// This file contains the Gmsh/FLTK specific parts of the OneLab // This file contains the Gmsh/FLTK specific parts of the OneLab
...@@ -1020,6 +1023,20 @@ void solver_cb(Fl_Widget *w, void *data) ...@@ -1020,6 +1023,20 @@ void solver_cb(Fl_Widget *w, void *data)
#else #else
#if defined(HAVE_ONELAB)
bool onelab::localNetworkClient::run(const std::string &what)
{
Msg::Error("The solver interface requires OneLab and FLTK 1.3");
return false;
}
bool onelab::localNetworkClient::kill()
{
Msg::Error("The solver interface requires OneLab and FLTK 1.3");
return false;
}
#endif
void solver_cb(Fl_Widget *w, void *data) void solver_cb(Fl_Widget *w, void *data)
{ {
Msg::Error("The solver interface requires OneLab and FLTK 1.3"); Msg::Error("The solver interface requires OneLab and FLTK 1.3");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment