mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hacky version of font_x and font_xft, compiles on Fedora Linux

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11054 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Matthias Melcher 2016-01-26 20:31:43 +00:00
parent 5892993cbc
commit 222538baad
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FL/Fl_Device.H
View File

@ -310,7 +310,7 @@ protected:
#else // X11
// FIXME: it should not be required to include this file here. This is nothing that the user should have access to.
#include "src/cfg_gfx/xlib.H"
#include "src/drivers/Xlib/Fl_Xlib_Graphics_Driver.h"
#endif

5
src/Makefile
View File

@ -497,10 +497,9 @@ 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_x.cxx fl_font_xft.cxx fl_font_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_x.cxx \
fl_set_fonts_xft.cxx fl_set_fonts_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

4
src/drivers/Xlib/Fl_Xlib_Graphics_Driver_color.cxx
View File

@ -31,7 +31,7 @@
// being used to index arrays. So I always copy them to an integer
// before use.
# include "../Fl_XColor.H"
# include "../../Fl_XColor.H"
# include <FL/Fl.H>
# include <FL/x.H>
# include <FL/fl_draw.H>
@ -92,7 +92,7 @@ static void figure_out_visual() {
}
static unsigned fl_cmap[256] = {
#include "../fl_cmap.h" // this is a file produced by "cmap.cxx":
#include "../../fl_cmap.h" // this is a file produced by "cmap.cxx":
};
# if HAVE_OVERLAY

3
src/fl_font.cxx
View File

@ -50,12 +50,11 @@
#elif defined(__APPLE__)
# include "cfg_gfx/quartz_font.cxx"
#elif USE_XFT
# include "fl_font_xft.cxx"
# include "drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx"
#elif defined(FL_PORTING)
# pragma message "FL_PORTING: implement font handling specifics in its own file"
#else
# include "drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.cxx"
# include "drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx"
#endif // WIN32
#if defined(WIN32) || defined(__APPLE__)

4
src/fl_set_fonts.cxx
View File

@ -27,10 +27,12 @@
#elif defined(__APPLE__)
# include "fl_set_fonts_mac.cxx"
#elif USE_XFT
# include "fl_set_fonts_xft.cxx"
//# include "fl_set_fonts_xft.cxx"
// now included for fl_font.cxx, but will be its own source code module in drivers/Xlib/Fl_Xlib_Graphics_Driver_font..."
#elif defined(FL_PORTING)
# pragma message "FL_PORTING: implement changes in font in its own file"
#else
//# include "fl_set_fonts_x.cxx"
// now included for fl_font.cxx, but will be its own source code module in drivers/Xlib/Fl_Xlib_Graphics_Driver_font..."
#endif // WIN32

4
src/makedepend
View File

@ -917,7 +917,7 @@ fl_font.o: ../FL/Fl_Window.H ../FL/Enumerations.H ../FL/Fl_Window.H
fl_font.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Bitmap.H
fl_font.o: ../FL/Fl_Image.H ../FL/Fl_Device.H ../FL/Fl_Plugin.H
fl_font.o: ../FL/Fl_Preferences.H ../FL/Fl_Image.H ../FL/Fl_Bitmap.H
fl_font.o: ../FL/Fl_Pixmap.H ../FL/Fl_RGB_Image.H Fl_Font.H fl_font_xft.cxx
fl_font.o: ../FL/Fl_Pixmap.H ../FL/Fl_RGB_Image.H Fl_Font.H
fl_gleam.o: ../FL/Fl.H ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
fl_gleam.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/fl_draw.H
fl_gleam.o: ../FL/x.H ../FL/Fl_Window.H ../FL/Enumerations.H
@ -1018,7 +1018,7 @@ fl_set_font.o: flstring.h ../FL/Fl_Export.H ../config.h Fl_Font.H
fl_set_fonts.o: ../FL/Fl.H ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
fl_set_fonts.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/x.H
fl_set_fonts.o: ../FL/Fl_Window.H Fl_Font.H ../config.h flstring.h
fl_set_fonts.o: ../FL/Fl_Export.H fl_set_fonts_xft.cxx
fl_set_fonts.o: ../FL/Fl_Export.H
fl_scroll_area.o: ../config.h ../FL/Fl.H ../FL/fl_utf8.h ../FL/Fl_Export.H
fl_scroll_area.o: ../FL/fl_types.h ../FL/Enumerations.H ../FL/abi-version.h
fl_scroll_area.o: ../FL/x.H ../FL/Fl_Window.H ../FL/fl_draw.H