|
 |
f702465 |
diff -rupN gmsh-4.1.3-source/Common/CommandLine.cpp gmsh-4.1.3-source-new/Common/CommandLine.cpp
|
|
|
f702465 |
--- gmsh-4.1.3-source/Common/CommandLine.cpp 2019-01-24 11:03:39.121351832 +0100
|
|
|
f702465 |
+++ gmsh-4.1.3-source-new/Common/CommandLine.cpp 2019-01-24 11:03:39.124351835 +0100
|
|
|
dbd8682 |
@@ -22,15 +22,6 @@
|
|
|
dbd8682 |
#include "GmshGlobal.h"
|
|
|
dbd8682 |
#include "StringUtils.h"
|
|
|
8cf3b72 |
|
|
|
8cf3b72 |
-#if defined(HAVE_FLTK)
|
|
|
8cf3b72 |
-#include <FL/Fl.H>
|
|
|
8cf3b72 |
-#if (FL_MAJOR_VERSION == 1) && (FL_MINOR_VERSION >= 3)
|
|
|
8cf3b72 |
-// OK
|
|
|
8cf3b72 |
-#else
|
|
|
8cf3b72 |
-#error "Gmsh requires FLTK >= 1.3"
|
|
|
8cf3b72 |
-#endif
|
|
|
8cf3b72 |
-#endif
|
|
|
8cf3b72 |
-
|
|
|
8cf3b72 |
#if defined(HAVE_PETSC)
|
|
|
8cf3b72 |
#include "petsc.h"
|
|
|
8cf3b72 |
#endif
|
|
|
dbd8682 |
@@ -51,6 +42,15 @@
|
|
|
8cf3b72 |
#include "Parser.h"
|
|
|
8cf3b72 |
#endif
|
|
|
8cf3b72 |
|
|
|
8cf3b72 |
+#if defined(HAVE_FLTK)
|
|
|
8cf3b72 |
+#include <FL/Fl.H>
|
|
|
8cf3b72 |
+#if (FL_MAJOR_VERSION == 1) && (FL_MINOR_VERSION >= 3)
|
|
|
8cf3b72 |
+// OK
|
|
|
8cf3b72 |
+#else
|
|
|
8cf3b72 |
+#error "Gmsh requires FLTK >= 1.3"
|
|
|
8cf3b72 |
+#endif
|
|
|
8cf3b72 |
+#endif
|
|
|
8cf3b72 |
+
|
|
|
8cf3b72 |
int GetGmshMajorVersion(){ return GMSH_MAJOR_VERSION; }
|
|
|
8cf3b72 |
int GetGmshMinorVersion(){ return GMSH_MINOR_VERSION; }
|
|
|
8cf3b72 |
int GetGmshPatchVersion(){ return GMSH_PATCH_VERSION; }
|
|
|
f702465 |
diff -rupN gmsh-4.1.3-source/Fltk/helpWindow.cpp gmsh-4.1.3-source-new/Fltk/helpWindow.cpp
|
|
|
f702465 |
--- gmsh-4.1.3-source/Fltk/helpWindow.cpp 2019-01-24 11:03:39.121351832 +0100
|
|
|
f702465 |
+++ gmsh-4.1.3-source-new/Fltk/helpWindow.cpp 2019-01-24 11:03:39.124351835 +0100
|
|
|
8cf3b72 |
@@ -3,13 +3,18 @@
|
|
|
8cf3b72 |
// See the LICENSE.txt file for license information. Please report all
|
|
|
ac057ca |
// issues on https://gitlab.onelab.info/gmsh/gmsh/issues.
|
|
|
8cf3b72 |
|
|
|
8cf3b72 |
+#include "GmshConfig.h"
|
|
|
8cf3b72 |
+
|
|
|
8cf3b72 |
+#if defined(HAVE_MED)
|
|
|
dbd8682 |
+#include <med/med.h>
|
|
|
8cf3b72 |
+#endif
|
|
|
8cf3b72 |
+
|
|
|
8cf3b72 |
#include <sstream>
|
|
|
8cf3b72 |
#include <algorithm>
|
|
|
8cf3b72 |
#include <FL/Fl_Help_View.H>
|
|
|
8cf3b72 |
#include <FL/Fl_Check_Button.H>
|
|
|
8cf3b72 |
#include <FL/Fl_Input.H>
|
|
|
8cf3b72 |
#include <FL/Fl_Color_Chooser.H>
|
|
|
8cf3b72 |
-#include "GmshConfig.h"
|
|
|
8cf3b72 |
#include "FlGui.h"
|
|
|
8cf3b72 |
#include "inputValue.h"
|
|
|
8cf3b72 |
#include "helpWindow.h"
|
|
|
c9defa2 |
@@ -33,10 +38,6 @@
|
|
|
8cf3b72 |
#include "Standard_Version.hxx"
|
|
|
8cf3b72 |
#endif
|
|
|
8cf3b72 |
|
|
|
8cf3b72 |
-#if defined(HAVE_MED)
|
|
|
dbd8682 |
-#include <med/med.h>
|
|
|
8cf3b72 |
-#endif
|
|
|
8cf3b72 |
-
|
|
|
8cf3b72 |
static const char *help_link(Fl_Widget *w, const char *uri)
|
|
|
8cf3b72 |
{
|
|
|
8cf3b72 |
fl_open_uri(uri);
|
|
|
f702465 |
diff -rupN gmsh-4.1.3-source/Geo/GModelIO_MED.cpp gmsh-4.1.3-source-new/Geo/GModelIO_MED.cpp
|
|
|
f702465 |
--- gmsh-4.1.3-source/Geo/GModelIO_MED.cpp 2019-01-24 11:03:39.122351833 +0100
|
|
|
f702465 |
+++ gmsh-4.1.3-source-new/Geo/GModelIO_MED.cpp 2019-01-24 11:03:39.124351835 +0100
|
|
|
cf4bbb5 |
@@ -26,9 +26,7 @@
|
|
|
8cf3b72 |
#include "discreteVertex.h"
|
|
|
cf4bbb5 |
#include "Context.h"
|
|
|
8cf3b72 |
|
|
|
8cf3b72 |
-extern "C" {
|
|
|
dbd8682 |
#include <med/med.h>
|
|
|
8cf3b72 |
-}
|
|
|
8cf3b72 |
|
|
|
ac057ca |
#if(MED_MAJOR_NUM >= 3)
|
|
|
8cf3b72 |
// To avoid too many ifdefs below we use defines for the bits of the
|
|
|
f702465 |
diff -rupN gmsh-4.1.3-source/Post/PViewDataGModelIO.cpp gmsh-4.1.3-source-new/Post/PViewDataGModelIO.cpp
|
|
|
f702465 |
--- gmsh-4.1.3-source/Post/PViewDataGModelIO.cpp 2019-01-24 11:03:39.122351833 +0100
|
|
|
f702465 |
+++ gmsh-4.1.3-source-new/Post/PViewDataGModelIO.cpp 2019-01-24 11:03:39.124351835 +0100
|
|
|
cf4bbb5 |
@@ -469,9 +469,7 @@ void PViewDataGModel::importLists(int N[
|
|
|
8cf3b72 |
|
|
|
8cf3b72 |
#if defined(HAVE_MED)
|
|
|
8cf3b72 |
|
|
|
8cf3b72 |
-extern "C" {
|
|
|
dbd8682 |
#include <med/med.h>
|
|
|
8cf3b72 |
-}
|
|
|
8cf3b72 |
|
|
|
ac057ca |
#if(MED_MAJOR_NUM >= 3)
|
|
|
8cf3b72 |
// To avoid too many ifdefs below we use defines for the bits of the
|