Fix examples build (configure/make)

Fix more issues caused by moving fltk-versions from examples to test
and adding examples to the CMake build process (gitlab-ci)

6 files changed, 23 insertions, 6 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 23794513d..2c339f508 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,7 +33,7 @@ build-autotools:
   # install the necessary build tools
   before_script:
     - apt update && apt -y install make autoconf man
-    - apt -y install freeglut3-dev libfontconfig-dev libxft-dev
+    - apt -y install freeglut3-dev libfontconfig-dev libxft-dev libglew-dev
     - apt -y install libxcursor-dev libxinerama-dev libasound2-dev
     - apt -y install libpango1.0-dev libcairo2-dev
   script:
@@ -47,7 +47,7 @@ build-autotools:
       - test/cairo_test
       - test/glpuzzle
       - test/unittests
-      - examples/fltk-versions
+      - test/fltk-versions
 
 # Build with CMake and Ninja (default configuration)
 
@@ -56,11 +56,11 @@ build-cmake:
   # install the necessary build tools
   before_script:
     - apt update && apt -y install cmake ninja-build
-    - apt -y install freeglut3-dev libfontconfig-dev libxft-dev
+    - apt -y install freeglut3-dev libfontconfig-dev libxft-dev libglew-dev
     - apt -y install libxcursor-dev libxinerama-dev libasound2-dev
   script:
     - mkdir build && cd build
-    - cmake -DCMAKE_BUILD_TYPE=Debug -G Ninja ..
+    - cmake -DCMAKE_BUILD_TYPE=Debug -DFLTK_BUILD_EXAMPLES=ON -G Ninja ..
     - time ninja
   artifacts:
     paths:
diff --git a/examples/.gitignore b/examples/.gitignore
index 398bba933..832dd5031 100644
--- a/examples/.gitignore
+++ b/examples/.gitignore
@@ -6,7 +6,6 @@
 browser-simple
 clipboard
 draggable-group
-fltk-versions
 howto-add_fd-and-popen
 howto-browser-with-icons
 howto-drag-and-drop
diff --git a/examples/Makefile b/examples/Makefile
index 4ed7c0567..50e777495 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -8,7 +8,6 @@ SHELL = /bin/sh
 ALL = browser-simple$(EXEEXT) \
       clipboard$(EXEEXT) \
       draggable-group$(EXEEXT) \
-      fltk-versions$(EXEEXT) \
       howto-add_fd-and-popen$(EXEEXT) \
       howto-browser-with-icons$(EXEEXT) \
       howto-drag-and-drop$(EXEEXT) \
diff --git a/test/.gitignore b/test/.gitignore
index d34e3338c..b81464e45 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -46,6 +46,7 @@ fast_slow
 fast_slow.cxx
 fast_slow.h
 file_chooser
+fltk-versions
 fonts
 forms
 fractals
diff --git a/test/Makefile b/test/Makefile
index fe51d7a9f..ec3e5d0a8 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -43,6 +43,7 @@ CPPFILES =\
 	editor.cxx \
 	fast_slow.cxx \
 	file_chooser.cxx \
+	fltk-versions.cxx \
 	fonts.cxx \
 	forms.cxx \
 	fractals.cxx \
@@ -128,6 +129,7 @@ ALL =	\
 	editor$(EXEEXT) \
 	fast_slow$(EXEEXT) \
 	file_chooser$(EXEEXT) \
+	fltk-versions$(EXEEXT) \
 	fonts$(EXEEXT) \
 	forms$(EXEEXT) \
 	hello$(EXEEXT) \
@@ -405,6 +407,8 @@ file_chooser$(EXEEXT): file_chooser.o $(IMGLIBNAME)
 	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) file_chooser.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
 	$(OSX_ONLY) ../fltk-config --post $@
 
+fltk-versions$(EXEEXT): fltk-versions.o
+
 fonts$(EXEEXT): fonts.o
 
 forms$(EXEEXT): forms.o
diff --git a/test/makedepend b/test/makedepend
index a4fe0bd2b..144f24669 100644
--- a/test/makedepend
+++ b/test/makedepend
@@ -710,6 +710,20 @@ file_chooser.o: ../FL/Fl_Valuator.H
 file_chooser.o: ../FL/Fl_Widget.H
 file_chooser.o: ../FL/Fl_Window.H
 file_chooser.o: ../FL/platform_types.h
+fltk-versions.o: ../FL/abi-version.h
+fltk-versions.o: ../FL/Enumerations.H
+fltk-versions.o: ../FL/Fl.H
+fltk-versions.o: ../FL/fl_ask.H
+fltk-versions.o: ../FL/Fl_Bitmap.H
+fltk-versions.o: ../FL/Fl_Box.H
+fltk-versions.o: ../FL/Fl_Export.H
+fltk-versions.o: ../FL/Fl_Group.H
+fltk-versions.o: ../FL/Fl_Image.H
+fltk-versions.o: ../FL/fl_types.h
+fltk-versions.o: ../FL/fl_utf8.h
+fltk-versions.o: ../FL/Fl_Widget.H
+fltk-versions.o: ../FL/Fl_Window.H
+fltk-versions.o: ../FL/platform_types.h
 fonts.o: ../FL/abi-version.h
 fonts.o: ../FL/Enumerations.H
 fonts.o: ../FL/filename.H