|
|
commit 206675a3b1495dd03067d764a5a97819e572b558
Author: Albrecht Schlosser <albrechts.fltk@online.de>
AuthorDate: Fri Aug 21 19:56:51 2020 +0200
Commit: Albrecht Schlosser <albrechts.fltk@online.de>
CommitDate: Fri Aug 21 20:00:00 2020 +0200
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)
.gitlab-ci.yml | 8 ++++----
examples/.gitignore | 1 -
examples/Makefile | 1 -
test/.gitignore | 1 +
test/Makefile | 4 ++++
test/makedepend | 14 ++++++++++++++
6 files changed, 23 insertions(+), 6 deletions(-)
diff --git .gitlab-ci.yml .gitlab-ci.yml
index 2379451..2c339f5 100644
--- .gitlab-ci.yml
+++ .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 examples/.gitignore examples/.gitignore
index 398bba9..832dd50 100644
--- examples/.gitignore
+++ 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 examples/Makefile examples/Makefile
index 4ed7c05..50e7774 100644
--- examples/Makefile
+++ 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 test/.gitignore test/.gitignore
index d34e333..b81464e 100644
--- test/.gitignore
+++ test/.gitignore
@@ -46,6 +46,7 @@ fast_slow
fast_slow.cxx
fast_slow.h
file_chooser
+fltk-versions
fonts
forms
fractals
diff --git test/Makefile test/Makefile
index fe51d7a..ec3e5d0 100644
--- test/Makefile
+++ 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 test/makedepend test/makedepend
index a4fe0bd..144f246 100644
--- test/makedepend
+++ 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
[ Direct Link to Message ] | |
|
| |