From 411e73fe242f66b26e98d8689ceb6f9b686c19f9 Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Wed, 27 Jan 2016 22:59:58 +0000 Subject: Messed up Makefiles in order to compile on OS X with carved out Graphics Driver git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11066 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Makefile | 13 +++++++++++++ src/drivers/Quartz/Fl_Quartz_Graphics_Driver.h | 2 +- src/drivers/Quartz/Fl_Quartz_Graphics_Driver_arci.cxx | 2 +- src/drivers/Quartz/Fl_Quartz_Graphics_Driver_color.cxx | 2 +- src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx | 2 +- src/drivers/Quartz/Fl_Quartz_Graphics_Driver_image.cxx | 2 +- src/drivers/Quartz/Fl_Quartz_Graphics_Driver_line_style.cxx | 2 +- src/drivers/Quartz/Fl_Quartz_Graphics_Driver_rect.cxx | 2 +- src/drivers/Quartz/Fl_Quartz_Graphics_Driver_vertex.cxx | 2 +- src/drivers/Quartz/Fl_Quartz_Printer_Graphics_Driver.cxx | 2 +- 10 files changed, 22 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/Makefile b/src/Makefile index 57a5bae14..624af5929 100644 --- a/src/Makefile +++ b/src/Makefile @@ -215,10 +215,23 @@ UTF8CFILES = \ xutf8/utf8Utils.c \ xutf8/utf8Wrap.c +QUARTZCPPFILES = \ + drivers/Quartz/Fl_Quartz_Graphics_Driver.cxx \ + drivers/Quartz/Fl_Quartz_Graphics_Driver_color.cxx \ + drivers/Quartz/Fl_Quartz_Graphics_Driver_rect.cxx \ + drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx \ + drivers/Quartz/Fl_Quartz_Graphics_Driver_vertex.cxx \ + drivers/Quartz/Fl_Quartz_Graphics_Driver_image.cxx \ + drivers/Quartz/Fl_Quartz_Printer_Graphics_Driver.cxx \ + drivers/Quartz/Fl_Quartz_Graphics_Driver_arci.cxx \ + drivers/Quartz/Fl_Quartz_Graphics_Driver_line_style.cxx + + ################################################################ FLTKFLAGS = -DFL_LIBRARY include ../makeinclude +CPPFILES += $(shell if test $(USEMMFILES) = Yes; then echo $(QUARTZCPPFILES); fi) MMFILES = $(shell if test $(USEMMFILES) = Yes; then echo $(OBJCPPFILES); fi) OBJECTS = $(MMFILES:.mm=.o) $(CPPFILES:.cxx=.o) $(CFILES:.c=.o) $(UTF8CFILES:.c=.o) diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.h b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.h index 829c3dd5e..b000aa230 100644 --- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.h +++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.h @@ -22,7 +22,7 @@ \brief Definition of Apple Quartz graphics driver. */ -#include "config_lib.h" +#include "../../config_lib.h" #ifdef FL_CFG_GFX_QUARTZ #ifndef FL_QUARTZ_GRAPHICS_DRIVER_H diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_arci.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_arci.cxx index 2375c3ef3..892baf859 100644 --- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_arci.cxx +++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_arci.cxx @@ -16,7 +16,7 @@ // http://www.fltk.org/str.php // -#include "config_lib.h" +#include "../../config_lib.h" #ifdef FL_CFG_GFX_QUARTZ #include "Fl_Quartz_Graphics_Driver.h" diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_color.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_color.cxx index 1a4b11aea..2b0cf2f7a 100644 --- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_color.cxx +++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_color.cxx @@ -16,7 +16,7 @@ // http://www.fltk.org/str.php // -#include "config_lib.h" +#include "../../config_lib.h" #ifdef FL_CFG_GFX_QUARTZ // The fltk "colormap". This allows ui colors to be stored in 8-bit diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx index cdcbd2cf2..39fd15785 100644 --- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx +++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx @@ -16,7 +16,7 @@ // http://www.fltk.org/str.php // -#include "config_lib.h" +#include "../../config_lib.h" #ifdef FL_CFG_GFX_QUARTZ #include "Fl_Quartz_Graphics_Driver.h" diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_image.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_image.cxx index 8b3229459..8bac28c42 100644 --- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_image.cxx +++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_image.cxx @@ -16,7 +16,7 @@ // http://www.fltk.org/str.php // -#include "config_lib.h" +#include "../../config_lib.h" #ifdef FL_CFG_GFX_QUARTZ #include "Fl_Quartz_Graphics_Driver.h" diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_line_style.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_line_style.cxx index e680ea43a..b3c8a9bfc 100644 --- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_line_style.cxx +++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_line_style.cxx @@ -16,7 +16,7 @@ // http://www.fltk.org/str.php // -#include "config_lib.h" +#include "../../config_lib.h" #ifdef FL_CFG_GFX_QUARTZ #include diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_rect.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_rect.cxx index fed0a6a4c..686c66e5d 100644 --- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_rect.cxx +++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_rect.cxx @@ -17,7 +17,7 @@ // -#include "config_lib.h" +#include "../../config_lib.h" #ifdef FL_CFG_GFX_QUARTZ #include diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_vertex.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_vertex.cxx index 83316507c..ad6977e12 100644 --- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_vertex.cxx +++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_vertex.cxx @@ -16,7 +16,7 @@ // http://www.fltk.org/str.php // -#include "config_lib.h" +#include "../../config_lib.h" #ifdef FL_CFG_GFX_QUARTZ /** diff --git a/src/drivers/Quartz/Fl_Quartz_Printer_Graphics_Driver.cxx b/src/drivers/Quartz/Fl_Quartz_Printer_Graphics_Driver.cxx index 73d24bd0f..ff9fcf834 100644 --- a/src/drivers/Quartz/Fl_Quartz_Printer_Graphics_Driver.cxx +++ b/src/drivers/Quartz/Fl_Quartz_Printer_Graphics_Driver.cxx @@ -17,7 +17,7 @@ // -#include "config_lib.h" +#include "../../config_lib.h" #ifdef FL_CFG_GFX_QUARTZ #include "Fl_Quartz_Printer_Graphics_Driver.h" -- cgit v1.2.3