summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorAlbrecht Schlosser <albrechts.fltk@online.de>2019-01-18 14:12:34 +0100
committerAlbrecht Schlosser <albrechts.fltk@online.de>2019-01-18 14:12:34 +0100
commit64cd95d6d514886914fa11ca523234a9c9687326 (patch)
tree265d49efdebbec3124dfa6c6c2b525c7a8bb6f4d /test
parent6bc3fa37681563882a03ec9b0eaf821d82c10964 (diff)
parent2167908f8e97a8d4927ad6e1d619c4c4869e97b8 (diff)
Merge branch 'fix-dependencies' (STR 3506)
This is intentionally a merge commit that includes both the fix necessary for STR 3506 and the update of all remaining dependencies.
Diffstat (limited to 'test')
-rw-r--r--test/Makefile5
-rw-r--r--test/makedepend6
2 files changed, 9 insertions, 2 deletions
diff --git a/test/Makefile b/test/Makefile
index 9b39f4388..1aae81534 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -3,7 +3,7 @@
#
# Test/example program makefile for the Fast Light Tool Kit (FLTK).
#
-# Copyright 1998-2017 by Bill Spitzak and others.
+# Copyright 1998-2019 by Bill Spitzak and others.
#
# This library is free software. Distribution and use rights are outlined in
# the file "COPYING" which should have been included with this file. If this
@@ -49,6 +49,7 @@ CPPFILES =\
fonts.cxx \
forms.cxx \
fractals.cxx \
+ fracviewer.cxx \
fullscreen.cxx \
gl_overlay.cxx \
glpuzzle.cxx \
@@ -286,7 +287,7 @@ unittests$(EXEEXT): unittests.o
unittests.o: unittests.cxx unittest_about.cxx unittest_points.cxx unittest_lines.cxx unittest_circles.cxx \
unittest_rects.cxx unittest_text.cxx unittest_symbol.cxx unittest_viewport.cxx unittest_images.cxx \
- unittest_schemes.cxx unittest_simple_terminal.cxx
+ unittest_schemes.cxx unittest_scrollbarsize.cxx unittest_simple_terminal.cxx
adjuster$(EXEEXT): adjuster.o
diff --git a/test/makedepend b/test/makedepend
index 4de3bf040..d8f25f780 100644
--- a/test/makedepend
+++ b/test/makedepend
@@ -318,6 +318,12 @@ fractals.o: ../FL/Fl_Window.H ../FL/Fl.H ../FL/Fl_Export.H ../FL/fl_utf8.h
fractals.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Bitmap.H
fractals.o: ../FL/Fl_Image.H ../FL/glu.h fracviewer.h ../FL/Fl_Button.H
fractals.o: ../FL/Fl_Window.H
+fracviewer.o: ../config.h ../FL/glut.H ../FL/gl.h ../FL/Enumerations.H
+fracviewer.o: ../FL/abi-version.h ../FL/Fl_Export.H ../FL/fl_types.h
+fracviewer.o: ../FL/platform_types.h ../FL/Fl.H ../FL/Fl_Gl_Window.H
+fracviewer.o: ../FL/Fl_Window.H ../FL/Fl.H ../FL/Fl_Export.H ../FL/fl_utf8.h
+fracviewer.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Bitmap.H
+fracviewer.o: ../FL/Fl_Image.H ../FL/glu.h fracviewer.h
fullscreen.o: ../config.h ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h
fullscreen.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
fullscreen.o: ../FL/Enumerations.H ../FL/abi-version.h