25 files changed, 6 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 578e420..ced42a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,6 +34,8 @@ LIBS="$LIBS $SDL_LIBS"
 AC_CONFIG_FILES([
  Makefile
  src/Makefile
+ src/libs/Makefile
+ src/libs/ray/Makefile
  src/modules/Makefile
  src/modules/julia/Makefile
  src/modules/plasma/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index b94b0f3..08546c4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
-SUBDIRS = modules
+SUBDIRS = libs modules
 bin_PROGRAMS = rototiller
 rototiller_SOURCES = fb.c fb.h fps.c fps.h rototiller.c rototiller.h sdl_fb.c settings.h settings.c setup.h setup.c threads.c threads.h util.c util.h
 if ENABLE_DRM
 rototiller_SOURCES += drm_fb.c
 endif
-rototiller_LDADD = -lm modules/julia/libjulia.a modules/plasma/libplasma.a modules/ray/libray.a modules/roto/libroto.a modules/sparkler/libsparkler.a modules/stars/libstars.a
+rototiller_LDADD = modules/julia/libjulia.a modules/plasma/libplasma.a modules/ray/libray.a modules/roto/libroto.a modules/sparkler/libsparkler.a modules/stars/libstars.a libs/ray/libray.a -lm
diff --git a/src/modules/ray/ray_3f.h b/src/libs/ray/ray_3f.h
index 2c04a5a..2c04a5a 100644
--- a/src/modules/ray/ray_3f.h
+++ b/src/libs/ray/ray_3f.h
diff --git a/src/modules/ray/ray_camera.c b/src/libs/ray/ray_camera.c
index b942cf3..b942cf3 100644
--- a/src/modules/ray/ray_camera.c
+++ b/src/libs/ray/ray_camera.c
diff --git a/src/modules/ray/ray_camera.h b/src/libs/ray/ray_camera.h
index e393beb..e393beb 100644
--- a/src/modules/ray/ray_camera.h
+++ b/src/libs/ray/ray_camera.h
diff --git a/src/modules/ray/ray_color.h b/src/libs/ray/ray_color.h
index 9fe62c1..9fe62c1 100644
--- a/src/modules/ray/ray_color.h
+++ b/src/libs/ray/ray_color.h
diff --git a/src/modules/ray/ray_euler.c b/src/libs/ray/ray_euler.c
index f143e25..f143e25 100644
--- a/src/modules/ray/ray_euler.c
+++ b/src/libs/ray/ray_euler.c
diff --git a/src/modules/ray/ray_euler.h b/src/libs/ray/ray_euler.h
index 39da17e..39da17e 100644
--- a/src/modules/ray/ray_euler.h
+++ b/src/libs/ray/ray_euler.h
diff --git a/src/modules/ray/ray_light_emitter.h b/src/libs/ray/ray_light_emitter.h
index 3b5509e..3b5509e 100644
--- a/src/modules/ray/ray_light_emitter.h
+++ b/src/libs/ray/ray_light_emitter.h
diff --git a/src/modules/ray/ray_object.h b/src/libs/ray/ray_object.h
index fc5ae1b..fc5ae1b 100644
--- a/src/modules/ray/ray_object.h
+++ b/src/libs/ray/ray_object.h
diff --git a/src/modules/ray/ray_object_light.h b/src/libs/ray/ray_object_light.h
index ca9bac9..ca9bac9 100644
--- a/src/modules/ray/ray_object_light.h
+++ b/src/libs/ray/ray_object_light.h
diff --git a/src/modules/ray/ray_object_plane.h b/src/libs/ray/ray_object_plane.h
index 96ed437..96ed437 100644
--- a/src/modules/ray/ray_object_plane.h
+++ b/src/libs/ray/ray_object_plane.h
diff --git a/src/modules/ray/ray_object_point.h b/src/libs/ray/ray_object_point.h
index 5685fdc..5685fdc 100644
--- a/src/modules/ray/ray_object_point.h
+++ b/src/libs/ray/ray_object_point.h
diff --git a/src/modules/ray/ray_object_sphere.h b/src/libs/ray/ray_object_sphere.h
index 71b6334..71b6334 100644
--- a/src/modules/ray/ray_object_sphere.h
+++ b/src/libs/ray/ray_object_sphere.h
diff --git a/src/modules/ray/ray_object_type.h b/src/libs/ray/ray_object_type.h
index ab797d2..ab797d2 100644
--- a/src/modules/ray/ray_object_type.h
+++ b/src/libs/ray/ray_object_type.h
diff --git a/src/modules/ray/ray_ray.h b/src/libs/ray/ray_ray.h
index 91469a2..91469a2 100644
--- a/src/modules/ray/ray_ray.h
+++ b/src/libs/ray/ray_ray.h
diff --git a/src/modules/ray/ray_render.c b/src/libs/ray/ray_render.c
index 8b930f6..8b930f6 100644
--- a/src/modules/ray/ray_render.c
+++ b/src/libs/ray/ray_render.c
diff --git a/src/modules/ray/ray_render.h b/src/libs/ray/ray_render.h
index dfd769f..dfd769f 100644
--- a/src/modules/ray/ray_render.h
+++ b/src/libs/ray/ray_render.h
diff --git a/src/modules/ray/ray_render_object.h b/src/libs/ray/ray_render_object.h
index 1136eee..1136eee 100644
--- a/src/modules/ray/ray_render_object.h
+++ b/src/libs/ray/ray_render_object.h
diff --git a/src/modules/ray/ray_render_object_plane.h b/src/libs/ray/ray_render_object_plane.h
index 6e00089..6e00089 100644
--- a/src/modules/ray/ray_render_object_plane.h
+++ b/src/libs/ray/ray_render_object_plane.h
diff --git a/src/modules/ray/ray_render_object_point.h b/src/libs/ray/ray_render_object_point.h
index 52c6fd6..52c6fd6 100644
--- a/src/modules/ray/ray_render_object_point.h
+++ b/src/libs/ray/ray_render_object_point.h
diff --git a/src/modules/ray/ray_render_object_sphere.h b/src/libs/ray/ray_render_object_sphere.h
index addf1f5..addf1f5 100644
--- a/src/modules/ray/ray_render_object_sphere.h
+++ b/src/libs/ray/ray_render_object_sphere.h
diff --git a/src/modules/ray/ray_scene.h b/src/libs/ray/ray_scene.h
index ff9c440..ff9c440 100644
--- a/src/modules/ray/ray_scene.h
+++ b/src/libs/ray/ray_scene.h
diff --git a/src/modules/ray/ray_surface.h b/src/libs/ray/ray_surface.h
index 2e7544b..2e7544b 100644
--- a/src/modules/ray/ray_surface.h
+++ b/src/libs/ray/ray_surface.h
diff --git a/src/modules/ray/Makefile.am b/src/modules/ray/Makefile.am
index 6c5900a..5fec057 100644
--- a/src/modules/ray/Makefile.am
+++ b/src/modules/ray/Makefile.am
@@ -1,4 +1,4 @@
 noinst_LIBRARIES = libray.a
-libray_a_SOURCES = ray_3f.h ray.c ray_camera.c ray_camera.h ray_color.h ray_euler.c ray_euler.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_SOURCES = ray.c
 libray_a_CFLAGS = -ffast-math
-libray_a_CPPFLAGS = -I@top_srcdir@/src
+libray_a_CPPFLAGS = -I@top_srcdir@/src -I@top_srcdir@/src/libs/ray