From 11b87c843e20f66bd68e02353ba4a1072e1230a6 Mon Sep 17 00:00:00 2001 From: Vito Caputo Date: Sun, 14 Feb 2021 22:43:08 -0800 Subject: *: split rototiller.[ch] into lib and main This is a first approximation of separating the core modules and threaded rendering from the cli-centric rototiller program and its sdl+drm video backends. Unfortunately this seemed to require switching over to libtool archives (.la) to permit consolidating the per-lib and per-module .a files into the librototiller.a and linking just with librototiller.a to depend on the aggregate of libs+modules+librototiller-glue in a simple fashion. If an alternative to .la comes up I will switch over to it, using libtool really slows down the build process. Those are implementation/build system details though. What's important in these changes is establishing something resembling a librototiller API boundary, enabling creating alternative frontends which vendor this tree as a submodule and link just to librototiller.{la,a} for all the modules+threaded rendering of them, while providing their own fb_ops_t for outputting into, and their own settings applicators for driving the modules setup. --- src/libs/ascii/Makefile.am | 6 +++--- src/libs/din/Makefile.am | 6 +++--- src/libs/grid/Makefile.am | 6 +++--- src/libs/puddle/Makefile.am | 6 +++--- src/libs/ray/Makefile.am | 8 ++++---- src/libs/sig/Makefile.am | 6 +++--- src/libs/txt/Makefile.am | 6 +++--- 7 files changed, 22 insertions(+), 22 deletions(-) (limited to 'src/libs') diff --git a/src/libs/ascii/Makefile.am b/src/libs/ascii/Makefile.am index 41476bb..bc8ab4a 100644 --- a/src/libs/ascii/Makefile.am +++ b/src/libs/ascii/Makefile.am @@ -1,3 +1,3 @@ -noinst_LIBRARIES = libascii.a -libascii_a_SOURCES = ascii.c ascii.h -libascii_a_CPPFLAGS = -I@top_srcdir@/src +noinst_LTLIBRARIES = libascii.la +libascii_la_SOURCES = ascii.c ascii.h +libascii_la_CPPFLAGS = -I@top_srcdir@/src diff --git a/src/libs/din/Makefile.am b/src/libs/din/Makefile.am index b918de6..dfbf9bf 100644 --- a/src/libs/din/Makefile.am +++ b/src/libs/din/Makefile.am @@ -1,3 +1,3 @@ -noinst_LIBRARIES = libdin.a -libdin_a_SOURCES = din.c din.h v3f.h -libdin_a_CPPFLAGS = -I@top_srcdir@/src +noinst_LTLIBRARIES = libdin.la +libdin_la_SOURCES = din.c din.h v3f.h +libdin_la_CPPFLAGS = -I@top_srcdir@/src diff --git a/src/libs/grid/Makefile.am b/src/libs/grid/Makefile.am index e9c8f3a..2d93699 100644 --- a/src/libs/grid/Makefile.am +++ b/src/libs/grid/Makefile.am @@ -1,3 +1,3 @@ -noinst_LIBRARIES = libgrid.a -libgrid_a_SOURCES = grid.c grid.h macros.h -libgrid_a_CPPFLAGS = -I@top_srcdir@/src +noinst_LTLIBRARIES = libgrid.la +libgrid_la_SOURCES = grid.c grid.h macros.h +libgrid_la_CPPFLAGS = -I@top_srcdir@/src diff --git a/src/libs/puddle/Makefile.am b/src/libs/puddle/Makefile.am index faacb49..b3cc0f8 100644 --- a/src/libs/puddle/Makefile.am +++ b/src/libs/puddle/Makefile.am @@ -1,3 +1,3 @@ -noinst_LIBRARIES = libpuddle.a -libpuddle_a_SOURCES = puddle.c puddle.h -libpuddle_a_CPPFLAGS = -I@top_srcdir@/src +noinst_LTLIBRARIES = libpuddle.la +libpuddle_la_SOURCES = puddle.c puddle.h +libpuddle_la_CPPFLAGS = -I@top_srcdir@/src diff --git a/src/libs/ray/Makefile.am b/src/libs/ray/Makefile.am index f055d94..6439f63 100644 --- a/src/libs/ray/Makefile.am +++ b/src/libs/ray/Makefile.am @@ -1,4 +1,4 @@ -noinst_LIBRARIES = libray.a -libray_a_SOURCES = ray_3f.h ray_camera.c ray_camera.h ray_color.h ray_euler.c ray_euler.h ray_gamma.c ray_gamma.h ray_light_emitter.h ray_object.h ray_object_light.h ray_object_plane.h ray_object_point.h ray_object_sphere.h ray_object_type.h ray_ray.h ray_render.c ray_render.h ray_render_object.h ray_render_object_plane.h ray_render_object_point.h ray_render_object_sphere.h ray_scene.h ray_surface.h -libray_a_CFLAGS = -ffast-math -libray_a_CPPFLAGS = -I@top_srcdir@/src +noinst_LTLIBRARIES = libray.la +libray_la_SOURCES = ray_3f.h ray_camera.c ray_camera.h ray_color.h ray_euler.c ray_euler.h ray_gamma.c ray_gamma.h ray_light_emitter.h ray_object.h ray_object_light.h ray_object_plane.h ray_object_point.h ray_object_sphere.h ray_object_type.h ray_ray.h ray_render.c ray_render.h ray_render_object.h ray_render_object_plane.h ray_render_object_point.h ray_render_object_sphere.h ray_scene.h ray_surface.h +libray_la_CFLAGS = -ffast-math +libray_la_CPPFLAGS = -I@top_srcdir@/src diff --git a/src/libs/sig/Makefile.am b/src/libs/sig/Makefile.am index 7e2537c..d81ae95 100644 --- a/src/libs/sig/Makefile.am +++ b/src/libs/sig/Makefile.am @@ -1,3 +1,3 @@ -noinst_LIBRARIES = libsig.a -libsig_a_SOURCES = ops_abs.c ops_add.c ops_ceil.c ops_clamp.c ops_const.c ops_div.c ops_expand.c ops_floor.c ops_inv.c ops_lerp.c ops_max.c ops_min.c ops_mult.c ops_neg.c ops_pow.c ops_rand.c ops_round.c ops_scale.c ops_sin.c ops_sub.c sig.c sig.h -libsig_a_CPPFLAGS = -I@top_srcdir@/src +noinst_LTLIBRARIES = libsig.la +libsig_la_SOURCES = ops_abs.c ops_add.c ops_ceil.c ops_clamp.c ops_const.c ops_div.c ops_expand.c ops_floor.c ops_inv.c ops_lerp.c ops_max.c ops_min.c ops_mult.c ops_neg.c ops_pow.c ops_rand.c ops_round.c ops_scale.c ops_sin.c ops_sub.c sig.c sig.h +libsig_la_CPPFLAGS = -I@top_srcdir@/src diff --git a/src/libs/txt/Makefile.am b/src/libs/txt/Makefile.am index 88aa79b..0d0db46 100644 --- a/src/libs/txt/Makefile.am +++ b/src/libs/txt/Makefile.am @@ -1,3 +1,3 @@ -noinst_LIBRARIES = libtxt.a -libtxt_a_SOURCES = txt.c txt.h -libtxt_a_CPPFLAGS = -I@top_srcdir@/src -I@top_srcdir@/src/libs +noinst_LTLIBRARIES = libtxt.la +libtxt_la_SOURCES = txt.c txt.h +libtxt_la_CPPFLAGS = -I@top_srcdir@/src -I@top_srcdir@/src/libs -- cgit v1.2.3