From 3070cc0dbf7346eeff323ed97a46e001aed2b46f Mon Sep 17 00:00:00 2001 From: kugel Date: Wed, 29 Apr 2009 22:58:56 +0000 Subject: [PATCH] Fix reds. libuisimulator.a apparently needs to be linked twice (aka quick fix as I don't know a better solution yet) :/ git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20830 a1c6a512-1295-4272-9138-f99709370657 --- firmware/export/config-ipodvideo.h | 9 ++++----- uisimulator/uisimulator.make | 5 +++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/firmware/export/config-ipodvideo.h b/firmware/export/config-ipodvideo.h index 6adcda9a1..e115f2d78 100644 --- a/firmware/export/config-ipodvideo.h +++ b/firmware/export/config-ipodvideo.h @@ -91,9 +91,13 @@ #define HAVE_BACKLIGHT #define HAVE_BACKLIGHT_BRIGHTNESS +#ifndef BOOTLOADER /* Support for LCD sleep/BCM shutdown */ #define HAVE_LCD_SLEEP #define HAVE_LCD_SLEEP_SETTING +/* The same code may also be used when shutting down the iPod */ +#define HAVE_LCD_SHUTDOWN +#endif /* We can fade the backlight by using PWM */ #define CONFIG_BACKLIGHT_FADING BACKLIGHT_FADING_PWM @@ -211,9 +215,4 @@ #define IPOD_ACCESSORY_PROTOCOL #define HAVE_SERIAL -#ifndef BOOTLOADER -/* The same code may also be used when shutting down the iPod */ -#define HAVE_LCD_SHUTDOWN -#endif - #endif diff --git a/uisimulator/uisimulator.make b/uisimulator/uisimulator.make index 9aeb02cd3..121f31e0f 100644 --- a/uisimulator/uisimulator.make +++ b/uisimulator/uisimulator.make @@ -28,8 +28,9 @@ $(SIMLIB): $$(SIMOBJ) $(UIBMP) $(SILENT)$(shell rm -f $@) $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null -$(BUILDDIR)/$(BINARY): $$(OBJ) $(FIRMLIB) $(SIMLIB) $(VOICESPEEXLIB) - $(call PRINTS,LD $(BINARY))$(CC) -o $@ $^ $(LDOPTS) +# SIMLIB needs to be linked twice for some reason +$(BUILDDIR)/$(BINARY): $$(OBJ) $(SIMLIB) $(VOICESPEEXLIB) $(FIRMLIB) + $(call PRINTS,LD $(BINARY))$(CC) -o $@ $^ $(SIMLIB) $(LDOPTS) $(BUILDDIR)/uisimulator/%.o: $(ROOTDIR)/uisimulator/%.c $(SILENT)mkdir -p $(dir $@) -- 2.11.4.GIT