summaryrefslogtreecommitdiffstats
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.tar.bz2
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:
.SECONDEXPANSION:
-ifndef SIMVER
-
ifeq (,$(findstring bootloader,$(APPSDIR)))
# not bootloader
+OBJ += $(LANG_O)
+
+ifndef SIMVER
+
## target build
RAMLDS := $(FIRMDIR)/target/$(CPU)/$(MANUFACTURER)/app.lds
LINKRAM := $(BUILDDIR)/ram.link
ROMLDS := $(FIRMDIR)/rom.lds
LINKROM := $(BUILDDIR)/rom.link
-OBJ += $(LANG_O)
$(LINKRAM): $(RAMLDS)
$(call PRINTS,PP $(@F))
@@ -180,8 +181,8 @@ $(MAXOUTFILE):
$(BUILDDIR)/rombox.iriver: $(BUILDDIR)/rombox.bin
$(call PRINTS,Build ROM file)$(MKFIRMWARE) $< $@
-endif # !bootloader
endif # !SIMVER
+endif # !bootloader
voicetools:
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)
SIMLIB = $(BUILDDIR)/uisimulator/libuisimulator.a
UIBMP = $(BUILDDIR)/UI256.bmp
+OBJ += $(LANG_O)
+
.SECONDEXPANSION: # $$(OBJ) is not populated until after this
$(SIMLIB): $$(SIMOBJ) $(UIBMP)