From b9d24d5e6bbf6f91d70c183bfaefcffce9c0ce5a Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Wed, 10 Oct 2001 11:15:38 +0000
Subject: [PATCH] fltk 1.1
---
Fltk/Callbacks.cpp | 7 ++++++-
Makefile | 8 ++++----
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/Fltk/Callbacks.cpp b/Fltk/Callbacks.cpp
index e30867cc52..d1e97bd522 100644
--- a/Fltk/Callbacks.cpp
+++ b/Fltk/Callbacks.cpp
@@ -1,4 +1,4 @@
-// $Id: Callbacks.cpp,v 1.84 2001-10-05 15:25:35 geuzaine Exp $
+// $Id: Callbacks.cpp,v 1.85 2001-10-10 11:15:38 geuzaine Exp $
#include <sys/types.h>
#include <signal.h>
@@ -23,7 +23,12 @@
using namespace std;
+#if (FL_MAJOR_VERSION == 1) && (FL_MINOR_VERSION == 1)
+#include <FL/Fl_File_Chooser.H>
+#else
#include <FL/fl_file_chooser.H>
+#endif
+
#include <errno.h>
extern GUI *WID;
diff --git a/Makefile b/Makefile
index b1a627a416..2bede61c24 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.156 2001-10-05 19:26:24 geuzaine Exp $
+# $Id: Makefile,v 1.157 2001-10-10 11:15:38 geuzaine Exp $
GMSH_RELEASE = 1.27
@@ -267,13 +267,13 @@ compile_fltk1:
"OS_FLAGS=-D_LITTLE_ENDIAN" \
"VERSION_FLAGS=-D_FLTK" \
"GL_INCLUDE=" \
- "GUI_INCLUDE=-I$(HOME)/SOURCES/fltk-1.1.0b1" \
+ "GUI_INCLUDE=-I$(HOME)/SOURCES/fltk-1.1.0b3" \
); done
link_fltk1:
$(CXX) -o $(GMSH_BIN_DIR)/gmsh $(GMSH_FLTK_LIB)\
- $(HOME)/SOURCES/fltk-1.1.0b1/lib/libfltkgl.a\
+ $(HOME)/SOURCES/fltk-1.1.0b3/lib/libfltk_gl.a\
$(OPENGL_LIB) \
- $(HOME)/SOURCES/fltk-1.1.0b1/lib/libfltk.a \
+ $(HOME)/SOURCES/fltk-1.1.0b3/lib/libfltk.a \
-L/usr/X11R6/lib $(X11_LIB) -lm
fltk1: compile_fltk1 link_fltk1
--
GitLab