diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2016-01-26 22:26:57 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2016-01-26 22:26:57 +0000 |
| commit | b1e15d245a624d42d7a3f451ab3ef3a2feb27640 (patch) | |
| tree | 3e41b36a1d1e354c7134b1d13430fc1d151125c0 | |
| parent | 87e29cef828548c397692473683eebd9613b661c (diff) | |
Further fudged up the Makefile dependencies.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11061 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | src/Makefile | 5 | ||||
| -rw-r--r-- | src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/src/Makefile b/src/Makefile index 6c215109b..57a5bae14 100644 --- a/src/Makefile +++ b/src/Makefile @@ -496,10 +496,7 @@ Fl.o: Fl_win32.cxx Fl_cocoa.o: Fl_cocoa.mm fl_color.o: fl_dnd.o: fl_dnd_win32.cxx fl_dnd_x.cxx -fl_draw_image.o: fl_draw_image_mac.cxx fl_draw_image_win32.cxx -fl_font.o: fl_font_win32.cxx fl_read_image.o: fl_read_image_mac.cxx fl_read_image_win32.cxx -fl_set_fonts.o: fl_set_fonts_mac.cxx fl_set_fonts_win32.cxx Fl_Printer.o: Fl_GDI_Printer.cxx Fl_PostScript.cxx Fl_Quartz_Printer.o: Fl_Quartz_Printer.mm fl_arci.o: ../FL/mac.H ../FL/win32.H @@ -512,8 +509,6 @@ fl_dnd.o: ../FL/mac.H ../FL/win32.H Fl.o: ../FL/mac.H ../FL/win32.H Fl_Double_Window.o: ../FL/mac.H ../FL/win32.H fl_draw_image.o: ../FL/mac.H ../FL/win32.H -fl_draw_image_mac.o: ../FL/mac.H ../FL/win32.H -fl_draw_image_win32.o: ../FL/mac.H ../FL/win32.H fl_draw_pixmap.o: ../FL/mac.H ../FL/win32.H fl_encoding_latin1.o: ../FL/mac.H ../FL/win32.H fl_encoding_mac_roman.o: ../FL/mac.H ../FL/win32.H diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx index 5ec63fd06..8e9cf1fc9 100644 --- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx +++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx @@ -48,8 +48,8 @@ # include <FL/Fl.H> # include <FL/fl_draw.H> # include <FL/x.H> -# include "Fl_XColor.H" -# include "flstring.h" +# include "../../Fl_XColor.H" +# include "../../flstring.h" static XImage xi; // template used to pass info to X static int bytes_per_pixel; |