gre-ilya/fltk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
ManoloFLTK 2019-03-28 18:42:33 +01:00
commit 7a3af40ede
4 changed files with 109 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cairo/makedepend
View File

@ -1,3 +1,17 @@
# DO NOT DELETE
# DO NOT DELETE THIS LINE -- make depend depends on it.
Fl_Cairo.o: ../config.h ../FL/Fl_Export.H
Fl_Cairo.o: ../config.h
Fl_Cairo.o: ../FL/abi-version.h
Fl_Cairo.o: ../FL/Enumerations.H
Fl_Cairo.o: ../FL/Fl_Bitmap.H
Fl_Cairo.o: ../FL/Fl_Cairo.H
Fl_Cairo.o: ../FL/Fl_Export.H
Fl_Cairo.o: ../FL/Fl_Group.H
Fl_Cairo.o: ../FL/Fl.H
Fl_Cairo.o: ../FL/Fl_Image.H
Fl_Cairo.o: ../FL/fl_types.h
Fl_Cairo.o: ../FL/fl_utf8.h
Fl_Cairo.o: ../FL/Fl_Widget.H
Fl_Cairo.o: ../FL/Fl_Window.H
Fl_Cairo.o: ../FL/platform.H
Fl_Cairo.o: ../FL/platform_types.h

62
src/Makefile
View File

@ -618,11 +618,11 @@ include makedepend
# These dependencies aren't part of the makedepend file since
# they are part of the Windows and MacOS code base...
# Please add only non-Linux/Unix files or such that are optional
# (like "*xft*") here:
# (like "*non-Xft*") here:
Fl_get_key_mac.o: Fl_get_key_mac.cxx
Fl_get_key_win32.o: Fl_get_key_win32.cxx
scandir_win32.o: scandir_win32.c
Fl_Native_File_Chooser_WIN32.o : Fl_Native_File_Chooser_WIN32.cxx
Fl_Native_File_Chooser_WIN32.o: Fl_Native_File_Chooser_WIN32.cxx
Fl_Native_File_Chooser_MAC.o: Fl_Native_File_Chooser_MAC.mm
Fl_Native_File_Chooser_FLTK.o: Fl_Native_File_Chooser_FLTK.cxx
Fl_Native_File_Chooser_GTK.o: Fl_Native_File_Chooser_GTK.cxx
@ -671,6 +671,64 @@ Fl_Window_fullscreen.o: ../FL/mac.H ../FL/win32.H
Fl_Window_iconize.o: ../FL/mac.H ../FL/win32.H
gl_draw.o: ../FL/mac.H ../FL/win32.H
gl_start.o: ../FL/mac.H ../FL/win32.H
# these additional dependencies are for non-Xft builds on Linux/Unix
drivers/X11/Fl_X11_Screen_Driver.o: Xutf8.h
drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.o: ../config.h
drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.o: drivers/Xlib/Fl_Font.H
drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.o: drivers/Xlib/Fl_Xlib_Graphics_Driver.H
drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.o: ../FL/abi-version.h
drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.o: ../FL/Enumerations.H
drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.o: ../FL/Fl_Bitmap.H
drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.o: ../FL/Fl_Device.H
drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.o: ../FL/fl_draw.H
drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.o: ../FL/Fl_Export.H
drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.o: ../FL/Fl_Graphics_Driver.H
drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.o: ../FL/Fl.H
drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.o: ../FL/Fl_Image.H
drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.o: ../FL/Fl_Pixmap.H
drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.o: ../FL/Fl_Plugin.H
drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.o: ../FL/Fl_Preferences.H
drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.o: ../FL/Fl_RGB_Image.H
drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.o: ../FL/fl_types.h
drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.o: ../FL/fl_utf8.h
drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.o: ../FL/Fl_Widget.H
drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.o: ../FL/platform.H
drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.o: ../FL/platform_types.h
drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.o: flstring.h
drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.o: Xutf8.h
drivers/Xlib/Fl_Xlib_Graphics_Driver.o: Xutf8.h
gl_draw.o: Xutf8.h
xutf8/utf8Utils.o: ../FL/Fl_Export.H
xutf8/utf8Utils.o: Xutf8.h
xutf8/utf8Wrap.o: ../FL/Fl_Export.H
xutf8/utf8Wrap.o: utf8_internal.h
xutf8/utf8Wrap.o: Xutf8.h
xutf8/utf8Wrap.o: xutf8/headers/dingbats_.h
xutf8/utf8Wrap.o: xutf8/headers/symbol_.h
xutf8/utf8Wrap.o: xutf8/lcUniConv/big5.h
xutf8/utf8Wrap.o: xutf8/lcUniConv/cp1251.h
xutf8/utf8Wrap.o: xutf8/lcUniConv/cp936ext.h
xutf8/utf8Wrap.o: xutf8/lcUniConv/gb2312.h
xutf8/utf8Wrap.o: xutf8/lcUniConv/iso8859_10.h
xutf8/utf8Wrap.o: xutf8/lcUniConv/iso8859_11.h
xutf8/utf8Wrap.o: xutf8/lcUniConv/iso8859_13.h
xutf8/utf8Wrap.o: xutf8/lcUniConv/iso8859_14.h
xutf8/utf8Wrap.o: xutf8/lcUniConv/iso8859_15.h
xutf8/utf8Wrap.o: xutf8/lcUniConv/iso8859_2.h
xutf8/utf8Wrap.o: xutf8/lcUniConv/iso8859_3.h
xutf8/utf8Wrap.o: xutf8/lcUniConv/iso8859_4.h
xutf8/utf8Wrap.o: xutf8/lcUniConv/iso8859_5.h
xutf8/utf8Wrap.o: xutf8/lcUniConv/iso8859_6.h
xutf8/utf8Wrap.o: xutf8/lcUniConv/iso8859_7.h
xutf8/utf8Wrap.o: xutf8/lcUniConv/iso8859_8.h
xutf8/utf8Wrap.o: xutf8/lcUniConv/iso8859_9.h
xutf8/utf8Wrap.o: xutf8/lcUniConv/jisx0201.h
xutf8/utf8Wrap.o: xutf8/lcUniConv/jisx0208.h
xutf8/utf8Wrap.o: xutf8/lcUniConv/jisx0212.h
xutf8/utf8Wrap.o: xutf8/lcUniConv/koi8_r.h
xutf8/utf8Wrap.o: xutf8/lcUniConv/koi8_u.h
xutf8/utf8Wrap.o: xutf8/lcUniConv/ksc5601.h
xutf8/utf8Wrap.o: xutf8/ucs2fontmap.c
################################################################

13
src/makedepend
View File

@ -2504,7 +2504,6 @@ Fl_Screen_Driver.o: ../FL/Fl_Valuator.H
Fl_Screen_Driver.o: ../FL/Fl_Widget.H
Fl_Screen_Driver.o: ../FL/Fl_Widget_Surface.H
Fl_Screen_Driver.o: ../FL/Fl_Window.H
Fl_Screen_Driver.o: ../FL/platform.H
Fl_Screen_Driver.o: ../FL/platform_types.h
Fl_Screen_Driver.o: Fl_Screen_Driver.H
Fl_Screen_Driver.o: Fl_Window_Driver.H
@ -3188,21 +3187,33 @@ Fl_Window.o: ../config.h
Fl_Window.o: ../FL/abi-version.h
Fl_Window.o: ../FL/Enumerations.H
Fl_Window.o: ../FL/Fl_Bitmap.H
Fl_Window.o: ../FL/Fl_Device.H
Fl_Window.o: ../FL/Fl_Double_Window.H
Fl_Window.o: ../FL/fl_draw.H
Fl_Window.o: ../FL/Fl_Export.H
Fl_Window.o: ../FL/Fl_Graphics_Driver.H
Fl_Window.o: ../FL/Fl_Group.H
Fl_Window.o: ../FL/Fl.H
Fl_Window.o: ../FL/Fl_Image.H
Fl_Window.o: ../FL/Fl_Overlay_Window.H
Fl_Window.o: ../FL/Fl_Pixmap.H
Fl_Window.o: ../FL/Fl_Plugin.H
Fl_Window.o: ../FL/Fl_Preferences.H
Fl_Window.o: ../FL/Fl_RGB_Image.H
Fl_Window.o: ../FL/Fl_Scrollbar.H
Fl_Window.o: ../FL/Fl_Slider.H
Fl_Window.o: ../FL/Fl_Text_Buffer.H
Fl_Window.o: ../FL/Fl_Text_Display.H
Fl_Window.o: ../FL/Fl_Text_Editor.H
Fl_Window.o: ../FL/Fl_Tooltip.H
Fl_Window.o: ../FL/fl_types.h
Fl_Window.o: ../FL/fl_utf8.h
Fl_Window.o: ../FL/Fl_Valuator.H
Fl_Window.o: ../FL/Fl_Widget.H
Fl_Window.o: ../FL/Fl_Window.H
Fl_Window.o: ../FL/platform.H
Fl_Window.o: ../FL/platform_types.h
Fl_Window.o: Fl_Screen_Driver.H
Fl_Window.o: flstring.h
Fl_Window.o: Fl_Window_Driver.H
Fl_Wizard.o: ../FL/abi-version.h

21
test/Makefile
View File

@ -195,6 +195,27 @@ depend: $(CPPFILES)
# Automatically generated dependencies...
include makedepend
# Additional dependencies...
cairo_test.o: ../FL/Fl_Bitmap.H
cairo_test.o: ../FL/Fl_Box.H
cairo_test.o: ../FL/Fl_Cairo_Window.H
cairo_test.o: ../FL/Fl_Device.H
cairo_test.o: ../FL/Fl_Double_Window.H
cairo_test.o: ../FL/fl_draw.H
cairo_test.o: ../FL/Fl_Graphics_Driver.H
cairo_test.o: ../FL/Fl_Group.H
cairo_test.o: ../FL/Fl.H
cairo_test.o: ../FL/Fl_Image.H
cairo_test.o: ../FL/Fl_Pixmap.H
cairo_test.o: ../FL/Fl_Plugin.H
cairo_test.o: ../FL/Fl_Preferences.H
cairo_test.o: ../FL/Fl_RGB_Image.H
cairo_test.o: ../FL/fl_utf8.h
cairo_test.o: ../FL/Fl_Widget.H
cairo_test.o: ../FL/Fl_Window.H
cairo_test.o: ../FL/math.h
cairo_test.o: ../FL/platform.H
clean:
$(RM) $(ALL) $(GLALL) core
for file in $(ALL) $(GLALL); do \