From aee387068f5b9013687250e8d655b56a0c5776f2 Mon Sep 17 00:00:00 2001
From: Thomas White <taw@bitwiz.me.uk>
Date: Fri, 22 Feb 2019 22:20:10 +0100
Subject: Rearrange rendering stuff

Rendering parts are allowed to access the internals of the slide
structure, to avoid a profusion of getter/setter functions.
---
 meson.build | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

(limited to 'meson.build')

diff --git a/meson.build b/meson.build
index 420c5b1..2f05a81 100644
--- a/meson.build
+++ b/meson.build
@@ -63,32 +63,19 @@ libstorycode = library('storycode',
                     'libstorycode/presentation.c',
                     'libstorycode/stylesheet.c',
                     'libstorycode/storycode.c',
+                    'libstorycode/slide_render_cairo.c',
                     storycode_lex_ch,
                     storycode_parse_ch,
                    ],
                    include_directories : libstorycode_includes,
+                   dependencies : [cairo_dep, pango_dep, gdkpixbuf_dep,
+                                   pangocairo_dep],
                    install : true)
 
 libstorycode_dep = declare_dependency(include_directories : libstorycode_includes,
                                       link_with : libstorycode)
 
 
-# libstorycode-cairo
-libstorycode_cairo_includes = include_directories('libstorycode/cairo')
-
-libstorycode_cairo = library('storycode-cairo',
-                   ['libstorycode/cairo/render.c',
-                   ],
-                   include_directories : libstorycode_cairo_includes,
-                   dependencies : [cairo_dep, pango_dep, gdkpixbuf_dep,
-                                   pangocairo_dep,
-                                   libstorycode_dep],
-                   install : true)
-
-libstorycode_cairo_dep = declare_dependency(include_directories : libstorycode_cairo_includes,
-                                            link_with : libstorycode_cairo)
-
-
 # libstorycode-gtk
 #libstorycode_gtk_includes = include_directories('libstorycode/gtk')
 #
@@ -111,8 +98,7 @@ executable('pdfstorycode',
            ],
            gresources,
            dependencies : [glib_dep, gio_dep, cairo_dep, pango_dep,
-                           pangocairo_dep,
-                           libstorycode_dep, libstorycode_cairo_dep])
+                           pangocairo_dep, libstorycode_dep])
 
 
 # Main program
-- 
cgit v1.2.3