From 459c27e11f8d7ca1f91803a509957764e333369c Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Tue, 19 Aug 2014 19:45:19 +0200
Subject: [PATCH] (SoftFilter) Build fixes for non_HAVE_DYLIB

---
 gfx/filter.c      | 9 +++++----
 griffin/griffin.c | 5 +----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/gfx/filter.c b/gfx/filter.c
index 7e76655625..71dc5c94bd 100644
--- a/gfx/filter.c
+++ b/gfx/filter.c
@@ -224,6 +224,7 @@ static const struct softfilter_config softfilter_config = {
 static bool create_softfilter_graph(rarch_softfilter_t *filt,
       enum retro_pixel_format in_pixel_format,
       unsigned max_width, unsigned max_height,
+      softfilter_simd_mask_t cpu_features,
       unsigned threads)
 {
    unsigned input_fmts, input_fmt, output_fmts;
@@ -283,7 +284,7 @@ static bool create_softfilter_graph(rarch_softfilter_t *filt,
    filt->max_height = max_height;
 
    filt->impl_data = filt->impl->create(&softfilter_config, input_fmt, input_fmt, max_width, max_height,
-         threads != RARCH_SOFTFILTER_THREADS_AUTO ? threads : rarch_get_cpu_cores(), rarch_get_cpu_features(),
+         threads != RARCH_SOFTFILTER_THREADS_AUTO ? threads : rarch_get_cpu_cores(), cpu_features,
          &userdata);
    if (!filt->impl_data)
    {
@@ -441,7 +442,7 @@ rarch_softfilter_t *rarch_softfilter_new(const char *filter_config,
 #if !defined(HAVE_FILTERS_BUILTIN) && defined(HAVE_DYLIB)
    char basedir[PATH_MAX];
 #endif
-   unsigned cpu_features;
+   softfilter_simd_mask_t cpu_features = rarch_get_cpu_features();
    struct string_list *plugs = NULL;
 
    rarch_softfilter_t *filt = (rarch_softfilter_t*)calloc(1, sizeof(*filt));
@@ -473,7 +474,7 @@ rarch_softfilter_t *rarch_softfilter_new(const char *filter_config,
 #endif
 
    if (!create_softfilter_graph(filt, in_pixel_format,
-            max_width, max_height, threads))
+            max_width, max_height, cpu_features, threads))
       goto error;
 
    return filt;
@@ -486,7 +487,7 @@ error:
 
 void rarch_softfilter_free(rarch_softfilter_t *filt)
 {
-   unsigned i;
+   unsigned i = 0;
    (void)i;
 
    if (!filt)
diff --git a/griffin/griffin.c b/griffin/griffin.c
index fef3cee737..dfcf19f668 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -464,10 +464,7 @@ FILTERS
 #include "../gfx/filters/darken.c"
 #include "../gfx/filters/epx.c"
 #include "../gfx/filters/scale2x.c"
-#include "../gfx/filters/blargg_ntsc_snes_rf.c"
-#include "../gfx/filters/blargg_ntsc_snes_composite.c"
-#include "../gfx/filters/blargg_ntsc_snes_svideo.c"
-#include "../gfx/filters/blargg_ntsc_snes_rgb.c"
+#include "../gfx/filters/blargg_ntsc_snes.c"
 #include "../gfx/filters/lq2x.c"
 #include "../gfx/filters/phosphor2x.c"