Blob Blame History Raw
diff -rupN gmsh-4.4.1-source/Common/CommandLine.cpp gmsh-4.4.1-source-new/Common/CommandLine.cpp
--- gmsh-4.4.1-source/Common/CommandLine.cpp	2019-07-29 16:44:32.132608978 +0200
+++ gmsh-4.4.1-source-new/Common/CommandLine.cpp	2019-07-29 16:44:32.135608880 +0200
@@ -22,15 +22,6 @@
 #include "GmshGlobal.h"
 #include "StringUtils.h"
 
-#if defined(HAVE_FLTK)
-#include <FL/Fl.H>
-#if (FL_MAJOR_VERSION == 1) && (FL_MINOR_VERSION >= 3)
-// OK
-#else
-#error "Gmsh requires FLTK >= 1.3"
-#endif
-#endif
-
 #if defined(HAVE_PETSC)
 #include "petsc.h"
 #endif
@@ -51,6 +42,15 @@
 #include "Parser.h"
 #endif
 
+#if defined(HAVE_FLTK)
+#include <FL/Fl.H>
+#if (FL_MAJOR_VERSION == 1) && (FL_MINOR_VERSION >= 3)
+// OK
+#else
+#error "Gmsh requires FLTK >= 1.3"
+#endif
+#endif
+
 int GetGmshMajorVersion(){ return GMSH_MAJOR_VERSION; }
 int GetGmshMinorVersion(){ return GMSH_MINOR_VERSION; }
 int GetGmshPatchVersion(){ return GMSH_PATCH_VERSION; }
diff -rupN gmsh-4.4.1-source/Fltk/helpWindow.cpp gmsh-4.4.1-source-new/Fltk/helpWindow.cpp
--- gmsh-4.4.1-source/Fltk/helpWindow.cpp	2019-07-29 16:44:32.132608978 +0200
+++ gmsh-4.4.1-source-new/Fltk/helpWindow.cpp	2019-07-29 16:44:32.136608848 +0200
@@ -3,6 +3,12 @@
 // See the LICENSE.txt file for license information. Please report all
 // issues on https://gitlab.onelab.info/gmsh/gmsh/issues.
 
+#include "GmshConfig.h"
+
+#if defined(HAVE_MED)
+#include <med/med.h>
+#endif
+
 #include <sstream>
 #include <algorithm>
 #include <string>
@@ -13,7 +19,6 @@
 #include <FL/Fl_Check_Button.H>
 #include <FL/Fl_Input.H>
 #include <FL/Fl_Color_Chooser.H>
-#include "GmshConfig.h"
 #include "FlGui.h"
 #include "inputValue.h"
 #include "helpWindow.h"
diff -rupN gmsh-4.4.1-source/Fltk/helpWindow.cpp.rej gmsh-4.4.1-source-new/Fltk/helpWindow.cpp.rej
--- gmsh-4.4.1-source/Fltk/helpWindow.cpp.rej	1970-01-01 01:00:00.000000000 +0100
+++ gmsh-4.4.1-source-new/Fltk/helpWindow.cpp.rej	2019-07-29 16:44:32.136608848 +0200
@@ -0,0 +1,22 @@
+--- Fltk/helpWindow.cpp	2019-04-19 22:52:22.064137747 +0200
++++ Fltk/helpWindow.cpp	2019-04-19 22:52:22.067137724 +0200
+@@ -3,13 +3,18 @@
+ // See the LICENSE.txt file for license information. Please report all
+ // issues on https://gitlab.onelab.info/gmsh/gmsh/issues.
+ 
++#include "GmshConfig.h"
++
++#if defined(HAVE_MED)
++#include <med/med.h>
++#endif
++
+ #include <sstream>
+ #include <algorithm>
+ #include <FL/Fl_Help_View.H>
+ #include <FL/Fl_Check_Button.H>
+ #include <FL/Fl_Input.H>
+ #include <FL/Fl_Color_Chooser.H>
+-#include "GmshConfig.h"
+ #include "FlGui.h"
+ #include "inputValue.h"
+ #include "helpWindow.h"