From 707e200676b8338dec55717bb98a1d6ddfd7f4dd Mon Sep 17 00:00:00 2001
From: Mischa Spiegelmock <revmischa@cpan.org>
Date: Tue, 13 Mar 2018 02:28:24 +0200
Subject: [PATCH] Native presets (#44)

* native presets building and work. need to figure out how to install them to the right place.

* revert main

* comments

* fix nativepreset installation dir to be presets dir
---
 configure.ac                           |  1 +
 src/Makefile.am                        |  2 +-
 src/NativePresets/Makefile.am          | 29 ++++++++++++++++++++++++++
 src/NativePresets/RLGFractalDrop7c.cpp |  5 +++--
 4 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 src/NativePresets/Makefile.am

diff --git a/configure.ac b/configure.ac
index 5c2b502b2..55ebf77ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,6 +31,7 @@ AC_CONFIG_FILES([
   src/libprojectM/Renderer/Makefile
   src/libprojectM/NativePresetFactory/Makefile
   src/libprojectM/MilkdropPresetFactory/Makefile
+  src/NativePresets/Makefile
 ])
 
 dnl from https://stackoverflow.com/questions/30897170/ac-subst-does-not-expand-variable answer: https://stackoverflow.com/a/30960268
diff --git a/src/Makefile.am b/src/Makefile.am
index 701e040df..76fef5049 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1 +1 @@
-SUBDIRS=libprojectM projectM-sdl
+SUBDIRS=libprojectM projectM-sdl NativePresets
diff --git a/src/NativePresets/Makefile.am b/src/NativePresets/Makefile.am
new file mode 100644
index 000000000..9a7e4f480
--- /dev/null
+++ b/src/NativePresets/Makefile.am
@@ -0,0 +1,29 @@
+AM_CPPFLAGS = \
+-include $(top_builddir)/config.h \
+-I${top_srcdir}/src/libprojectM \
+-I${top_srcdir}/src/libprojectM/Renderer \
+-I${top_srcdir}/src/libprojectM/NativePresetFactory
+
+AM_CFLAGS = ${my_CFLAGS} \
+-fvisibility=hidden \
+-ffunction-sections \
+-fdata-sections
+
+presetsdir = $(pkgdatadir)/presets
+
+# native presets are shared object files.
+# they should get installed to $presetsdir/
+presets_LTLIBRARIES = \
+  libMstressJuppyDancer.la \
+  libRLGFractalDrop7c.la \
+	libRovastarDarkSecret.la \
+  libRovastarDriftingChaos.la \
+  libRovastarFractalSpiral.la \
+  libRovastarFractopiaFrantic.la
+
+libMstressJuppyDancer_la_SOURCES = MstressJuppyDancer.cpp
+libRLGFractalDrop7c_la_SOURCES = RLGFractalDrop7c.cpp
+libRovastarDarkSecret_la_SOURCES = RovastarDarkSecret.cpp
+libRovastarDriftingChaos_la_SOURCES = RovastarDriftingChaos.cpp
+libRovastarFractalSpiral_la_SOURCES = RovastarFractalSpiral.cpp
+libRovastarFractopiaFrantic_la_SOURCES = RovastarFractopiaFrantic.cpp
diff --git a/src/NativePresets/RLGFractalDrop7c.cpp b/src/NativePresets/RLGFractalDrop7c.cpp
index fe9640956..17b0de039 100644
--- a/src/NativePresets/RLGFractalDrop7c.cpp
+++ b/src/NativePresets/RLGFractalDrop7c.cpp
@@ -11,6 +11,7 @@
 #include "MilkdropCompatability.hpp"
 #include "VideoEcho.hpp"
 #include "NativePreset.hpp"
+#include "MilkdropWaveform.hpp"
 
 class RLGFractalDrop7c : public Pipeline
 {
@@ -140,7 +141,7 @@ public:
 		shape4.ang = time;
 	}
 
-	virtual Point PerPixel(Point p, const PerPixelContext context)
+	virtual PixelPoint PerPixel(PixelPoint p, const PerPixelContext context)
 	{
 		Transforms::Zoom(p,context,1.029902,1.00);
 		return p;
@@ -149,7 +150,7 @@ public:
 };
 
 
-typedef NativePreset<RLGFractalDrop7> RLGFractalDrop7Preset;
+typedef NativePreset<RLGFractalDrop7c> RLGFractalDrop7Preset;
 
 extern "C" RLGFractalDrop7Preset * create(const char * url) {
 	return new RLGFractalDrop7Preset(std::string(url));