diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2020-08-21 19:56:51 +0200 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2020-08-21 20:00:00 +0200 |
| commit | 206675a3b1495dd03067d764a5a97819e572b558 (patch) | |
| tree | e29d99931c6c425077bd6e0725e0cb0c26c9dda9 /test | |
| parent | 9ba4cd06dc28d63537c6412200bfe0dee4540f39 (diff) | |
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)
Diffstat (limited to 'test')
| -rw-r--r-- | test/.gitignore | 1 | ||||
| -rw-r--r-- | test/Makefile | 4 | ||||
| -rw-r--r-- | test/makedepend | 14 |
3 files changed, 19 insertions, 0 deletions
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 |