Kaydet (Commit) 46ef233b authored tarafından Michael Meeks's avatar Michael Meeks

headless: move backend to top-level, and enable for all platforms

üst b26a596c
...@@ -116,13 +116,13 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gtk3,\ ...@@ -116,13 +116,13 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gtk3,\
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk \ vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk \
vcl/unx/gtk3/window/gtk3gtkframe \ vcl/unx/gtk3/window/gtk3gtkframe \
vcl/unx/gtk3/window/gtk3gtkobject \ vcl/unx/gtk3/window/gtk3gtkobject \
vcl/unx/headless/svpbmp \ vcl/headless/svpbmp \
vcl/unx/headless/svpdummies \ vcl/headless/svpdummies \
vcl/unx/headless/svpelement \ vcl/headless/svpelement \
vcl/unx/headless/svpframe \ vcl/headless/svpframe \
vcl/unx/headless/svpprn \ vcl/headless/svpprn \
vcl/unx/headless/svptext \ vcl/headless/svptext \
vcl/unx/headless/svpvd \ vcl/headless/svpvd \
)) ))
ifeq ($(OS),LINUX) ifeq ($(OS),LINUX)
......
...@@ -78,16 +78,16 @@ $(eval $(call gb_Library_use_externals,vclplug_svp,\ ...@@ -78,16 +78,16 @@ $(eval $(call gb_Library_use_externals,vclplug_svp,\
)) ))
$(eval $(call gb_Library_add_exception_objects,vclplug_svp,\ $(eval $(call gb_Library_add_exception_objects,vclplug_svp,\
vcl/unx/headless/svpbmp \ vcl/headless/svpbmp \
vcl/unx/headless/svpdummies \ vcl/headless/svpdummies \
vcl/unx/headless/svpelement \ vcl/headless/svpelement \
vcl/unx/headless/svpframe \ vcl/headless/svpframe \
vcl/unx/headless/svpgdi \ vcl/headless/svpgdi \
vcl/unx/headless/svpinst \ vcl/headless/svpinst \
vcl/unx/headless/svpprn \ vcl/headless/svpprn \
vcl/unx/headless/svppspgraphics \ vcl/headless/svppspgraphics \
vcl/unx/headless/svptext \ vcl/headless/svptext \
vcl/unx/headless/svpvd \ vcl/headless/svpvd \
)) ))
ifeq ($(OS),LINUX) ifeq ($(OS),LINUX)
......
...@@ -31,17 +31,17 @@ $(eval $(call gb_Module_Module,vcl)) ...@@ -31,17 +31,17 @@ $(eval $(call gb_Module_Module,vcl))
$(eval $(call gb_Module_add_targets,vcl,\ $(eval $(call gb_Module_add_targets,vcl,\
Library_vcl \ Library_vcl \
Library_vclplug_svp \
StaticLibrary_vclmain \ StaticLibrary_vclmain \
Package_inc \ Package_inc \
Package_afmhash \
AllLangResTarget_vcl \ AllLangResTarget_vcl \
)) ))
ifeq ($(GUIBASE),unx) ifeq ($(GUIBASE),unx)
$(eval $(call gb_Module_add_targets,vcl,\ $(eval $(call gb_Module_add_targets,vcl,\
Library_vclplug_gen \ Library_vclplug_gen \
Library_vclplug_svp \
Library_desktop_detector \ Library_desktop_detector \
Package_afmhash \
)) ))
ifneq ($(ENABLE_GTK),) ifneq ($(ENABLE_GTK),)
......
Welcome to the Visual Class Libraries (vcl) code Welcome to the Visual Class Libraries (vcl) code
source/ source/
+ the main cross-platform chunk of source + the main cross-platform chunk of source
inc/ inc/
+ cross-platform abstraction headers / definition + cross-platform abstraction headers / definition
vcl/ vcl/
+ external headers + external headers
generic/ generic/
+ shared helper code for backends, + shared helper code for backends,
actually built into vcl actually built into vcl
headless/
+ a backend renderer that draws to bitmaps
aqua/ aqua/
+ OS/X backend + OS/X backend
ios/ ios/
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
* *
************************************************************************/ ************************************************************************/
#include "unx/headless/svpbmp.hxx" #include "headless/svpbmp.hxx"
#include <basegfx/vector/b2ivector.hxx> #include <basegfx/vector/b2ivector.hxx>
#include <basegfx/range/b2irange.hxx> #include <basegfx/range/b2irange.hxx>
......
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
* *
************************************************************************/ ************************************************************************/
#include "unx/headless/svpdummies.hxx" #include "headless/svpdummies.hxx"
#include "unx/headless/svpinst.hxx" #include "headless/svpinst.hxx"
#include <rtl/ustrbuf.hxx> #include <rtl/ustrbuf.hxx>
// SalObject // SalObject
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
* *
************************************************************************/ ************************************************************************/
#include "unx/headless/svpelement.hxx" #include "headless/svpelement.hxx"
#include <basebmp/scanlineformats.hxx> #include <basebmp/scanlineformats.hxx>
#include <tools/debug.hxx> #include <tools/debug.hxx>
...@@ -39,9 +39,9 @@ ...@@ -39,9 +39,9 @@
#include <vcl/bitmap.hxx> #include <vcl/bitmap.hxx>
#include <tools/stream.hxx> #include <tools/stream.hxx>
#include "unx/headless/svpvd.hxx" #include "headless/svpvd.hxx"
#include "unx/headless/svpbmp.hxx" #include "headless/svpbmp.hxx"
#include "unx/headless/svpframe.hxx" #include "headless/svpframe.hxx"
#include <list> #include <list>
#include <boost/unordered_map.hpp> #include <boost/unordered_map.hpp>
......
...@@ -26,9 +26,9 @@ ...@@ -26,9 +26,9 @@
* *
************************************************************************/ ************************************************************************/
#include "unx/headless/svpframe.hxx" #include "headless/svpframe.hxx"
#include "unx/headless/svpinst.hxx" #include "headless/svpinst.hxx"
#include "unx/headless/svpgdi.hxx" #include "headless/svpgdi.hxx"
#include <basebmp/scanlineformats.hxx> #include <basebmp/scanlineformats.hxx>
#include <basegfx/vector/b2ivector.hxx> #include <basegfx/vector/b2ivector.hxx>
......
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
* *
************************************************************************/ ************************************************************************/
#include "unx/headless/svpgdi.hxx" #include "headless/svpgdi.hxx"
#include "unx/headless/svpbmp.hxx" #include "headless/svpbmp.hxx"
#include <vcl/sysdata.hxx> #include <vcl/sysdata.hxx>
#include <basegfx/range/b2drange.hxx> #include <basegfx/range/b2drange.hxx>
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#endif #endif
#include "unx/headless/svppspgraphics.hxx" #include "headless/svppspgraphics.hxx"
#include <region.h> #include <region.h>
using namespace basegfx; using namespace basegfx;
......
...@@ -35,11 +35,11 @@ ...@@ -35,11 +35,11 @@
#include <vcl/apptypes.hxx> #include <vcl/apptypes.hxx>
#include "unx/headless/svpinst.hxx" #include "headless/svpinst.hxx"
#include "unx/headless/svpframe.hxx" #include "headless/svpframe.hxx"
#include "unx/headless/svpdummies.hxx" #include "headless/svpdummies.hxx"
#include "unx/headless/svpvd.hxx" #include "headless/svpvd.hxx"
#include "unx/headless/svpbmp.hxx" #include "headless/svpbmp.hxx"
#include <salframe.hxx> #include <salframe.hxx>
#include <svdata.hxx> #include <svdata.hxx>
......
...@@ -42,9 +42,9 @@ ...@@ -42,9 +42,9 @@
#include "salptype.hxx" #include "salptype.hxx"
#include "saldatabasic.hxx" #include "saldatabasic.hxx"
#include "unx/headless/svpprn.hxx" #include "headless/svpprn.hxx"
#include "unx/headless/svppspgraphics.hxx" #include "headless/svppspgraphics.hxx"
#include "unx/headless/svpinst.hxx" #include "headless/svpinst.hxx"
using namespace psp; using namespace psp;
......
...@@ -53,8 +53,8 @@ ...@@ -53,8 +53,8 @@
#include "outfont.hxx" #include "outfont.hxx"
#include "fontsubset.hxx" #include "fontsubset.hxx"
#include "generic/printergfx.hxx" #include "generic/printergfx.hxx"
#include "unx/headless/svppspgraphics.hxx" #include "headless/svppspgraphics.hxx"
#include "unx/headless/svpbmp.hxx" #include "headless/svpbmp.hxx"
#include "generic/glyphcache.hxx" #include "generic/glyphcache.hxx"
#include "region.h" #include "region.h"
......
...@@ -43,9 +43,9 @@ ...@@ -43,9 +43,9 @@
#include <rtl/instance.hxx> #include <rtl/instance.hxx>
#include "generic/glyphcache.hxx" #include "generic/glyphcache.hxx"
#include "unx/headless/svpgdi.hxx" #include "headless/svpgdi.hxx"
#include "unx/headless/svpbmp.hxx" #include "headless/svpbmp.hxx"
#include "unx/headless/svppspgraphics.hxx" #include "headless/svppspgraphics.hxx"
using namespace basegfx; using namespace basegfx;
using namespace basebmp; using namespace basebmp;
......
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
* *
************************************************************************/ ************************************************************************/
#include "unx/headless/svpvd.hxx" #include "headless/svpvd.hxx"
#include "unx/headless/svpgdi.hxx" #include "headless/svpgdi.hxx"
#include <basegfx/vector/b2ivector.hxx> #include <basegfx/vector/b2ivector.hxx>
#include <basebmp/scanlineformats.hxx> #include <basebmp/scanlineformats.hxx>
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#if GTK_CHECK_VERSION(3,0,0) #if GTK_CHECK_VERSION(3,0,0)
#include <unx/headless/svpgdi.hxx> #include <headless/svpgdi.hxx>
class GtkSalFrame; class GtkSalFrame;
class GtkSalGraphics : public SvpSalGraphics class GtkSalGraphics : public SvpSalGraphics
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include <unx/salinst.h> #include <unx/salinst.h>
#include <generic/gensys.h> #include <generic/gensys.h>
#include <unx/headless/svpinst.hxx> #include <headless/svpinst.hxx>
#include <gtk/gtk.h> #include <gtk/gtk.h>
class GtkYieldMutex : public SalYieldMutex class GtkYieldMutex : public SalYieldMutex
......
...@@ -36,8 +36,8 @@ ...@@ -36,8 +36,8 @@
#include <unx/gtk/gtkframe.hxx> #include <unx/gtk/gtkframe.hxx>
#include <unx/gtk/gtkobject.hxx> #include <unx/gtk/gtkobject.hxx>
#include <unx/gtk/atkbridge.hxx> #include <unx/gtk/atkbridge.hxx>
#include <unx/headless/svpvd.hxx> #include <headless/svpvd.hxx>
#include <unx/headless/svpbmp.hxx> #include <headless/svpbmp.hxx>
#include <rtl/strbuf.hxx> #include <rtl/strbuf.hxx>
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#include <unx/salbmp.h> #include <unx/salbmp.h>
#include <generic/genprn.h> #include <generic/genprn.h>
#include <generic/geninst.h> #include <generic/geninst.h>
#include <unx/headless/svpgdi.hxx> #include <headless/svpgdi.hxx>
#include <vcl/floatwin.hxx> #include <vcl/floatwin.hxx>
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
#include <vcl/window.hxx> #include <vcl/window.hxx>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment