1
0
Fork 0
forked from len0rd/rockbox

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
This commit is contained in:
Daniel Stenberg 2009-02-09 18:31:56 +00:00
parent 1f3d667b1a
commit dca7d391f1
3 changed files with 9 additions and 5 deletions

View file

@ -38,8 +38,11 @@ include $(APPSDIR)/codecs/libwma/libwma.make
CODECFLAGS = $(CFLAGS) -I$(APPSDIR)/codecs -I$(APPSDIR)/codecs/lib \ CODECFLAGS = $(CFLAGS) -I$(APPSDIR)/codecs -I$(APPSDIR)/codecs/lib \
-DCODEC -DCODEC
CODEC_LDS := $(APPSDIR)/plugins/plugin.lds # codecs and plugins use same file ifndef SIMVER
CODECLINK_LDS := $(CODECDIR)/codec.link CODEC_LDS := $(APPSDIR)/plugins/plugin.lds # codecs and plugins use same file
CODECLINK_LDS := $(CODECDIR)/codec.link
endif
CODEC_CRT0 := $(CODECDIR)/codec_crt0.o CODEC_CRT0 := $(CODECDIR)/codec_crt0.o
CODECLIBS := $(DEMACLIB) $(A52LIB) $(ALACLIB) $(ASAPLIB) \ CODECLIBS := $(DEMACLIB) $(A52LIB) $(ALACLIB) $(ASAPLIB) \

View file

@ -10,9 +10,8 @@ OUTPUT_FORMAT(elf32-littlearm)
OUTPUT_FORMAT(elf32-sh) OUTPUT_FORMAT(elf32-sh)
#elif defined(CPU_MIPS) #elif defined(CPU_MIPS)
OUTPUT_FORMAT(elf32-littlemips) OUTPUT_FORMAT(elf32-littlemips)
#elif !defined(SIMULATOR) #else
/* We cannot have an #error here when building simulators since we don't have /* We can have an #error here we don't use this file when build sims! */
any CPU defined then! */
#error Unknown CPU architecture #error Unknown CPU architecture
#endif #endif

View file

@ -33,8 +33,10 @@ PLUGINSUBDIRS := $(call preprocess, $(APPSDIR)/plugins/SUBDIRS)
$(foreach dir,$(PLUGINSUBDIRS),$(eval include $(dir)/$(notdir $(dir)).make)) $(foreach dir,$(PLUGINSUBDIRS),$(eval include $(dir)/$(notdir $(dir)).make))
### build data / rules ### build data / rules
ifndef SIMVER
PLUGIN_LDS := $(APPSDIR)/plugins/plugin.lds PLUGIN_LDS := $(APPSDIR)/plugins/plugin.lds
PLUGINLINK_LDS := $(BUILDDIR)/apps/plugins/plugin.link PLUGINLINK_LDS := $(BUILDDIR)/apps/plugins/plugin.link
endif
OTHER_INC += -I$(APPSDIR)/plugins -I$(APPSDIR)/plugins/lib OTHER_INC += -I$(APPSDIR)/plugins -I$(APPSDIR)/plugins/lib