From 745dda489c9c04066e2bae48a1875bce78bae22b Mon Sep 17 00:00:00 2001 From: funman Date: Sun, 24 Jan 2010 15:32:23 +0000 Subject: [PATCH] *.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 --- apps/codecs/codecs.make | 3 ++- apps/plugins/plugins.make | 3 ++- tools/root.make | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/apps/codecs/codecs.make b/apps/codecs/codecs.make index f169ade79..391975d73 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 62640ab63..febc80ac9 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 b65af039a..8d54140a9 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)) -- 2.11.4.GIT