make sure plugin.lds is not processed when building sims since it isn't used for anything then!

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19957 a1c6a512-1295-4272-9138-f99709370657

3 files changed, 9 insertions, 5 deletions

diff --git a/apps/codecs/codecs.make b/apps/codecs/codecs.make
index 8bfa53c1cf..e8ecc3d22d 100644
--- a/apps/codecs/codecs.make
+++ b/apps/codecs/codecs.make
@@ -38,8 +38,11 @@ include $(APPSDIR)/codecs/libwma/libwma.make
 CODECFLAGS = $(CFLAGS) -I$(APPSDIR)/codecs -I$(APPSDIR)/codecs/lib \
         -DCODEC
 
-CODEC_LDS := $(APPSDIR)/plugins/plugin.lds # codecs and plugins use same file
-CODECLINK_LDS := $(CODECDIR)/codec.link
+ifndef SIMVER
+  CODEC_LDS := $(APPSDIR)/plugins/plugin.lds # codecs and plugins use same file
+  CODECLINK_LDS := $(CODECDIR)/codec.link
+endif
+
 CODEC_CRT0 := $(CODECDIR)/codec_crt0.o
 
 CODECLIBS := $(DEMACLIB) $(A52LIB) $(ALACLIB) $(ASAPLIB) \
diff --git a/apps/plugins/plugin.lds b/apps/plugins/plugin.lds
index dd52fbac22..8840805702 100644
--- a/apps/plugins/plugin.lds
+++ b/apps/plugins/plugin.lds
@@ -10,9 +10,8 @@ OUTPUT_FORMAT(elf32-littlearm)
 OUTPUT_FORMAT(elf32-sh)
 #elif defined(CPU_MIPS)
 OUTPUT_FORMAT(elf32-littlemips)
-#elif !defined(SIMULATOR)
-/* We cannot have an #error here when building simulators since we don't have
-   any CPU defined then! */
+#else
+/* We can have an #error here we don't use this file when build sims! */
 #error Unknown CPU architecture
 #endif
 
diff --git a/apps/plugins/plugins.make b/apps/plugins/plugins.make
index 0f6804d591..182bd11559 100644
--- a/apps/plugins/plugins.make
+++ b/apps/plugins/plugins.make
@@ -33,8 +33,10 @@ PLUGINSUBDIRS := $(call preprocess, $(APPSDIR)/plugins/SUBDIRS)
 $(foreach dir,$(PLUGINSUBDIRS),$(eval include $(dir)/$(notdir $(dir)).make))
 
 ### build data / rules
+ifndef SIMVER
 PLUGIN_LDS := $(APPSDIR)/plugins/plugin.lds
 PLUGINLINK_LDS := $(BUILDDIR)/apps/plugins/plugin.link
+endif
 
 OTHER_INC += -I$(APPSDIR)/plugins -I$(APPSDIR)/plugins/lib