diff options
-rw-r--r-- | apps/codecs/codecs.make | 7 | ||||
-rw-r--r-- | apps/plugins/plugin.lds | 5 | ||||
-rw-r--r-- | apps/plugins/plugins.make | 2 |
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 | |||
38 | CODECFLAGS = $(CFLAGS) -I$(APPSDIR)/codecs -I$(APPSDIR)/codecs/lib \ | 38 | CODECFLAGS = $(CFLAGS) -I$(APPSDIR)/codecs -I$(APPSDIR)/codecs/lib \ |
39 | -DCODEC | 39 | -DCODEC |
40 | 40 | ||
41 | CODEC_LDS := $(APPSDIR)/plugins/plugin.lds # codecs and plugins use same file | 41 | ifndef SIMVER |
42 | CODECLINK_LDS := $(CODECDIR)/codec.link | 42 | CODEC_LDS := $(APPSDIR)/plugins/plugin.lds # codecs and plugins use same file |
43 | CODECLINK_LDS := $(CODECDIR)/codec.link | ||
44 | endif | ||
45 | |||
43 | CODEC_CRT0 := $(CODECDIR)/codec_crt0.o | 46 | CODEC_CRT0 := $(CODECDIR)/codec_crt0.o |
44 | 47 | ||
45 | CODECLIBS := $(DEMACLIB) $(A52LIB) $(ALACLIB) $(ASAPLIB) \ | 48 | 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) | |||
10 | OUTPUT_FORMAT(elf32-sh) | 10 | OUTPUT_FORMAT(elf32-sh) |
11 | #elif defined(CPU_MIPS) | 11 | #elif defined(CPU_MIPS) |
12 | OUTPUT_FORMAT(elf32-littlemips) | 12 | OUTPUT_FORMAT(elf32-littlemips) |
13 | #elif !defined(SIMULATOR) | 13 | #else |
14 | /* We cannot have an #error here when building simulators since we don't have | 14 | /* We can have an #error here we don't use this file when build sims! */ |
15 | any CPU defined then! */ | ||
16 | #error Unknown CPU architecture | 15 | #error Unknown CPU architecture |
17 | #endif | 16 | #endif |
18 | 17 | ||
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) | |||
33 | $(foreach dir,$(PLUGINSUBDIRS),$(eval include $(dir)/$(notdir $(dir)).make)) | 33 | $(foreach dir,$(PLUGINSUBDIRS),$(eval include $(dir)/$(notdir $(dir)).make)) |
34 | 34 | ||
35 | ### build data / rules | 35 | ### build data / rules |
36 | ifndef SIMVER | ||
36 | PLUGIN_LDS := $(APPSDIR)/plugins/plugin.lds | 37 | PLUGIN_LDS := $(APPSDIR)/plugins/plugin.lds |
37 | PLUGINLINK_LDS := $(BUILDDIR)/apps/plugins/plugin.link | 38 | PLUGINLINK_LDS := $(BUILDDIR)/apps/plugins/plugin.link |
39 | endif | ||
38 | 40 | ||
39 | OTHER_INC += -I$(APPSDIR)/plugins -I$(APPSDIR)/plugins/lib | 41 | OTHER_INC += -I$(APPSDIR)/plugins -I$(APPSDIR)/plugins/lib |
40 | 42 | ||