summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Stenberg <bjorn@haxx.se>2008-11-21 15:27:16 +0000
committerBjörn Stenberg <bjorn@haxx.se>2008-11-21 15:27:16 +0000
commit6b96270856395e3771ea00af5a4893c4774357a6 (patch)
tree711e326334d18be09220ac619164b6f1bf1c5496
parentac355de664fdd4c4a5c716d8b3a190a8202540aa (diff)
downloadrockbox-6b96270856395e3771ea00af5a4893c4774357a6.tar.gz
rockbox-6b96270856395e3771ea00af5a4893c4774357a6.zip
Added LANG_O to simulators as well.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19171 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--tools/root.make9
-rw-r--r--uisimulator/uisimulator.make2
2 files changed, 7 insertions, 4 deletions
diff --git a/tools/root.make b/tools/root.make
index 0d12e30a4b..c0030970d4 100644
--- a/tools/root.make
+++ b/tools/root.make
@@ -98,18 +98,19 @@ clean:
98 98
99.SECONDEXPANSION: 99.SECONDEXPANSION:
100 100
101ifndef SIMVER
102
103ifeq (,$(findstring bootloader,$(APPSDIR))) 101ifeq (,$(findstring bootloader,$(APPSDIR)))
104# not bootloader 102# not bootloader
105 103
104OBJ += $(LANG_O)
105
106ifndef SIMVER
107
106## target build 108## target build
107RAMLDS := $(FIRMDIR)/target/$(CPU)/$(MANUFACTURER)/app.lds 109RAMLDS := $(FIRMDIR)/target/$(CPU)/$(MANUFACTURER)/app.lds
108LINKRAM := $(BUILDDIR)/ram.link 110LINKRAM := $(BUILDDIR)/ram.link
109ROMLDS := $(FIRMDIR)/rom.lds 111ROMLDS := $(FIRMDIR)/rom.lds
110LINKROM := $(BUILDDIR)/rom.link 112LINKROM := $(BUILDDIR)/rom.link
111 113
112OBJ += $(LANG_O)
113 114
114$(LINKRAM): $(RAMLDS) 115$(LINKRAM): $(RAMLDS)
115 $(call PRINTS,PP $(@F)) 116 $(call PRINTS,PP $(@F))
@@ -180,8 +181,8 @@ $(MAXOUTFILE):
180$(BUILDDIR)/rombox.iriver: $(BUILDDIR)/rombox.bin 181$(BUILDDIR)/rombox.iriver: $(BUILDDIR)/rombox.bin
181 $(call PRINTS,Build ROM file)$(MKFIRMWARE) $< $@ 182 $(call PRINTS,Build ROM file)$(MKFIRMWARE) $< $@
182 183
183endif # !bootloader
184endif # !SIMVER 184endif # !SIMVER
185endif # !bootloader
185 186
186 187
187voicetools: 188voicetools:
diff --git a/uisimulator/uisimulator.make b/uisimulator/uisimulator.make
index b2096c2a1a..d35f2e6d57 100644
--- a/uisimulator/uisimulator.make
+++ b/uisimulator/uisimulator.make
@@ -22,6 +22,8 @@ OTHER_SRC += $(SIMSRC)
22SIMLIB = $(BUILDDIR)/uisimulator/libuisimulator.a 22SIMLIB = $(BUILDDIR)/uisimulator/libuisimulator.a
23UIBMP = $(BUILDDIR)/UI256.bmp 23UIBMP = $(BUILDDIR)/UI256.bmp
24 24
25OBJ += $(LANG_O)
26
25.SECONDEXPANSION: # $$(OBJ) is not populated until after this 27.SECONDEXPANSION: # $$(OBJ) is not populated until after this
26 28
27$(SIMLIB): $$(SIMOBJ) $(UIBMP) 29$(SIMLIB): $$(SIMOBJ) $(UIBMP)