summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafaël Carré <rafael.carre@gmail.com>2010-01-24 15:32:23 +0000
committerRafaël Carré <rafael.carre@gmail.com>2010-01-24 15:32:23 +0000
commita9e2a7148f7748129e5c7dafd043878dfcac5394 (patch)
tree4eb3fd7d9fb0c8e9337975faa444474a6aaa68c7
parentb2323be33b5a89cc244d4488b21263a359aced96 (diff)
downloadrockbox-a9e2a7148f7748129e5c7dafd043878dfcac5394.tar.gz
rockbox-a9e2a7148f7748129e5c7dafd043878dfcac5394.tar.bz2
rockbox-a9e2a7148f7748129e5c7dafd043878dfcac5394.zip
*.link: depends on config file where plugin buffer size is set
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24322 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/codecs/codecs.make3
-rw-r--r--apps/plugins/plugins.make3
-rw-r--r--tools/root.make3
3 files changed, 6 insertions, 3 deletions
diff --git a/apps/codecs/codecs.make b/apps/codecs/codecs.make
index f169ade798..391975d73c 100644
--- a/apps/codecs/codecs.make
+++ b/apps/codecs/codecs.make
@@ -45,6 +45,7 @@ CODECFLAGS = $(filter-out -fno-strict-aliasing,$(CFLAGS)) -fstrict-aliasing \
-I$(APPSDIR)/codecs -I$(APPSDIR)/codecs/lib -DCODEC
ifndef SIMVER
+ CONFIGFILE := $(FIRMDIR)/export/config/$(MODELNAME).h
CODEC_LDS := $(APPSDIR)/plugins/plugin.lds # codecs and plugins use same file
CODECLINK_LDS := $(CODECDIR)/codec.link
endif
@@ -59,7 +60,7 @@ CODECLIBS := $(DEMACLIB) $(A52LIB) $(ALACLIB) $(ASAPLIB) \
$(CODECS): $(CODEC_CRT0) $(CODECLINK_LDS)
-$(CODECLINK_LDS): $(CODEC_LDS)
+$(CODECLINK_LDS): $(CODEC_LDS) $(CONFIGFILE)
$(call PRINTS,PP $(@F))
$(shell mkdir -p $(dir $@))
$(call preprocess2file, $<, $@, -DCODEC)
diff --git a/apps/plugins/plugins.make b/apps/plugins/plugins.make
index 62640ab630..febc80ac95 100644
--- a/apps/plugins/plugins.make
+++ b/apps/plugins/plugins.make
@@ -28,6 +28,7 @@ PLUGINLIB_OBJ := $(subst $(ROOTDIR),$(BUILDDIR),$(PLUGINLIB_OBJ))
### build data / rules
ifndef SIMVER
+CONFIGFILE := $(FIRMDIR)/export/config/$(MODELNAME).h
PLUGIN_LDS := $(APPSDIR)/plugins/plugin.lds
PLUGINLINK_LDS := $(BUILDDIR)/apps/plugins/plugin.link
OVERLAYREF_LDS := $(BUILDDIR)/apps/plugins/overlay_ref.link
@@ -54,7 +55,7 @@ $(PLUGINLIB): $(PLUGINLIB_OBJ)
$(SILENT)$(shell rm -f $@)
$(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
-$(PLUGINLINK_LDS): $(PLUGIN_LDS)
+$(PLUGINLINK_LDS): $(PLUGIN_LDS) $(CONFIGFILE)
$(call PRINTS,PP $(@F))
$(shell mkdir -p $(dir $@))
$(call preprocess2file,$<,$@,-DLOADADDRESS=$(LOADADDRESS))
diff --git a/tools/root.make b/tools/root.make
index b65af039a3..8d54140a9b 100644
--- a/tools/root.make
+++ b/tools/root.make
@@ -141,13 +141,14 @@ OBJ += $(LANG_O)
ifndef SIMVER
## target build
+CONFIGFILE := $(FIRMDIR)/export/config/$(MODELNAME).h
RAMLDS := $(FIRMDIR)/target/$(CPU)/$(MANUFACTURER)/app.lds
LINKRAM := $(BUILDDIR)/ram.link
ROMLDS := $(FIRMDIR)/rom.lds
LINKROM := $(BUILDDIR)/rom.link
-$(LINKRAM): $(RAMLDS)
+$(LINKRAM): $(RAMLDS) $(CONFIGFILE)
$(call PRINTS,PP $(@F))
$(call preprocess2file,$<,$@,-DLOADADDRESS=$(LOADADDRESS))