4 files changed, 1 insertions, 25 deletions
diff --git a/apps/plugins/lib/SOURCES b/apps/plugins/lib/SOURCES
index fa12f94..1db9896 100644
--- a/apps/plugins/lib/SOURCES
+++ b/apps/plugins/lib/SOURCES
@@ -75,19 +75,3 @@ pluginlib_albumart.c
 #ifdef HAVE_TOUCHSCREEN
 pluginlib_touchscreen.c
 #endif
-
-#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
-
-#ifdef CPU_ARM
-../../codecs/lib/setjmp_arm.S
-#endif
-
-#ifdef CPU_COLDFIRE
-../../codecs/lib/setjmp_cf.S
-#endif
-
-#ifdef CPU_MIPS
-../../codecs/lib/setjmp_mips.S
-#endif
-
-#endif /* PLATFORM_NATIVE */
diff --git a/apps/plugins/lib/pluginlib_exit.h b/apps/plugins/lib/pluginlib_exit.h
index 00cbc8d..8c7f0c4 100644
--- a/apps/plugins/lib/pluginlib_exit.h
+++ b/apps/plugins/lib/pluginlib_exit.h
@@ -23,11 +23,7 @@
 #define __PLUGINLIB_EXIT_H__
 
 #include "config.h"
-#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
-#include "../../codecs/lib/setjmp.h"
-#else
 #include <setjmp.h>
-#endif
 
 #define _PLUGINLIB_EXIT_INIT(atexit) switch(setjmp(__exit_env))   \
                                      {                            \
diff --git a/apps/plugins/lua/rockconf.h b/apps/plugins/lua/rockconf.h
index dd7f98f..c0a2331 100644
--- a/apps/plugins/lua/rockconf.h
+++ b/apps/plugins/lua/rockconf.h
@@ -31,11 +31,7 @@
 #undef LUA_PATH_DEFAULT
 #define LUA_PATH_DEFAULT  "$/?.lua;" "$/?/init.lua;" VIEWERS_DIR"/lua/?.lua;" VIEWERS_DIR"/lua/?/init.lua;"
 
-#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
-#include "../../codecs/lib/setjmp.h"
-#else
 #include <setjmp.h>
-#endif
 
 #include "lib/pluginlib_exit.h"
 
diff --git a/apps/plugins/plugins.make b/apps/plugins/plugins.make
index d3c66c3..532dba6 100644
--- a/apps/plugins/plugins.make
+++ b/apps/plugins/plugins.make
@@ -89,7 +89,7 @@ else
 endif
 PLUGINLDFLAGS += $(GLOBAL_LDOPTS)
 
-$(BUILDDIR)/%.rock:
+$(BUILDDIR)/%.rock: $(LIBSETJMP)
 	$(call PRINTS,LD $(@F))$(CC) $(PLUGINFLAGS) -o $(BUILDDIR)/$*.elf \
 		$(filter %.o, $^) \
 		$(filter %.a, $+) \