diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | test/Makefile | 2 | ||||
| -rw-r--r-- | test/makedepend | 37 |
3 files changed, 40 insertions, 3 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index b6bc2c303..6fb3b5105 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -197,7 +197,7 @@ endif (OPENGL_FOUND) # Cairo demo - must also be built w/o Cairo (displays a message box) if (FLTK_HAVE_CAIRO) - CREATE_EXAMPLE (cairo_test cairo_test.cxx "fltk_cairo;fltk;cairo") + CREATE_EXAMPLE (cairo_test cairo_test.cxx "fltk;cairo") else () CREATE_EXAMPLE (cairo_test cairo_test.cxx fltk) endif (FLTK_HAVE_CAIRO) @@ -257,7 +257,7 @@ if (OPTION_BUILD_SHARED_LIBS) endif (OPENGL_FOUND) if (FLTK_HAVE_CAIRO) - CREATE_EXAMPLE (cairo_test-shared cairo_test.cxx "fltk_cairo_SHARED;fltk_SHARED;cairo") + CREATE_EXAMPLE (cairo_test-shared cairo_test.cxx "fltk_SHARED;cairo") endif () endif (MSVC) # (not MSVC) diff --git a/test/Makefile b/test/Makefile index 2a5ea0980..96f8d36ae 100644 --- a/test/Makefile +++ b/test/Makefile @@ -682,5 +682,5 @@ shape$(EXEEXT): shape.o cairo_test$(EXEEXT): cairo_test.o echo Linking $@... - $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(CAIROFLAGS) $(LDFLAGS) -o $@ cairo_test.o $(LINKFLTK) $(LINKFLTKCAIRO) $(GLDLIBS) + $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(CAIROFLAGS) $(LDFLAGS) -o $@ cairo_test.o $(LINKFLTK) $(CAIROLIBS) $(GLDLIBS) $(OSX_ONLY) ../fltk-config --post $@ diff --git a/test/makedepend b/test/makedepend index 23dac2f28..323339151 100644 --- a/test/makedepend +++ b/test/makedepend @@ -2643,6 +2643,7 @@ twowin.o: ../FL/platform_types.h unittests.o: ../FL/Enumerations.H unittests.o: ../FL/filename.H unittests.o: ../FL/Fl.H +unittests.o: ../FL/fl_ask.H unittests.o: ../FL/fl_attr.h unittests.o: ../FL/Fl_Bitmap.H unittests.o: ../FL/Fl_Box.H @@ -2666,8 +2667,12 @@ unittests.o: ../FL/Fl_Preferences.H unittests.o: ../FL/Fl_Rect.H unittests.o: ../FL/Fl_RGB_Image.H unittests.o: ../FL/Fl_Scrollbar.H +unittests.o: ../FL/Fl_Simple_Terminal.H unittests.o: ../FL/Fl_Slider.H +unittests.o: ../FL/Fl_String.H unittests.o: ../FL/fl_string_functions.h +unittests.o: ../FL/Fl_Text_Buffer.H +unittests.o: ../FL/Fl_Text_Display.H unittests.o: ../FL/fl_types.h unittests.o: ../FL/fl_utf8.h unittests.o: ../FL/Fl_Valuator.H @@ -2768,6 +2773,38 @@ unittest_complex_shapes.o: ../FL/Fl_Widget.H unittest_complex_shapes.o: ../FL/Fl_Window.H unittest_complex_shapes.o: ../FL/platform_types.h unittest_complex_shapes.o: unittests.h +unittest_core.o: ../FL/Enumerations.H +unittest_core.o: ../FL/Fl.H +unittest_core.o: ../FL/fl_attr.h +unittest_core.o: ../FL/Fl_Bitmap.H +unittest_core.o: ../FL/Fl_Cairo.H +unittest_core.o: ../FL/fl_casts.H +unittest_core.o: ../FL/fl_config.h +unittest_core.o: ../FL/Fl_Device.H +unittest_core.o: ../FL/Fl_Double_Window.H +unittest_core.o: ../FL/fl_draw.H +unittest_core.o: ../FL/Fl_Export.H +unittest_core.o: ../FL/Fl_Graphics_Driver.H +unittest_core.o: ../FL/Fl_Group.H +unittest_core.o: ../FL/Fl_Image.H +unittest_core.o: ../FL/Fl_Pixmap.H +unittest_core.o: ../FL/Fl_Plugin.H +unittest_core.o: ../FL/Fl_Preferences.H +unittest_core.o: ../FL/Fl_Rect.H +unittest_core.o: ../FL/Fl_RGB_Image.H +unittest_core.o: ../FL/Fl_Scrollbar.H +unittest_core.o: ../FL/Fl_Simple_Terminal.H +unittest_core.o: ../FL/Fl_Slider.H +unittest_core.o: ../FL/Fl_String.H +unittest_core.o: ../FL/Fl_Text_Buffer.H +unittest_core.o: ../FL/Fl_Text_Display.H +unittest_core.o: ../FL/fl_types.h +unittest_core.o: ../FL/fl_utf8.h +unittest_core.o: ../FL/Fl_Valuator.H +unittest_core.o: ../FL/Fl_Widget.H +unittest_core.o: ../FL/Fl_Window.H +unittest_core.o: ../FL/platform_types.h +unittest_core.o: unittests.h unittest_fast_shapes.o: ../config.h unittest_fast_shapes.o: ../FL/Enumerations.H unittest_fast_shapes.o: ../FL/Fl.H |