diff options
author | Thomas Martitz <kugel@rockbox.org> | 2009-04-29 22:58:56 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2009-04-29 22:58:56 +0000 |
commit | 23e505b32bfdac4bdbd14298d7b387597515392a (patch) | |
tree | e66d08b43e675e407d83ac740a05d76a6a3679f4 | |
parent | a7f4e1f1c51c6f99d17eb25dbdd57a78af4cb0e1 (diff) | |
download | rockbox-23e505b32bfdac4bdbd14298d7b387597515392a.tar.gz rockbox-23e505b32bfdac4bdbd14298d7b387597515392a.zip |
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
-rw-r--r-- | firmware/export/config-ipodvideo.h | 9 | ||||
-rw-r--r-- | 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 6adcda9a1e..e115f2d786 100644 --- a/firmware/export/config-ipodvideo.h +++ b/firmware/export/config-ipodvideo.h | |||
@@ -91,9 +91,13 @@ | |||
91 | #define HAVE_BACKLIGHT | 91 | #define HAVE_BACKLIGHT |
92 | #define HAVE_BACKLIGHT_BRIGHTNESS | 92 | #define HAVE_BACKLIGHT_BRIGHTNESS |
93 | 93 | ||
94 | #ifndef BOOTLOADER | ||
94 | /* Support for LCD sleep/BCM shutdown */ | 95 | /* Support for LCD sleep/BCM shutdown */ |
95 | #define HAVE_LCD_SLEEP | 96 | #define HAVE_LCD_SLEEP |
96 | #define HAVE_LCD_SLEEP_SETTING | 97 | #define HAVE_LCD_SLEEP_SETTING |
98 | /* The same code may also be used when shutting down the iPod */ | ||
99 | #define HAVE_LCD_SHUTDOWN | ||
100 | #endif | ||
97 | 101 | ||
98 | /* We can fade the backlight by using PWM */ | 102 | /* We can fade the backlight by using PWM */ |
99 | #define CONFIG_BACKLIGHT_FADING BACKLIGHT_FADING_PWM | 103 | #define CONFIG_BACKLIGHT_FADING BACKLIGHT_FADING_PWM |
@@ -211,9 +215,4 @@ | |||
211 | #define IPOD_ACCESSORY_PROTOCOL | 215 | #define IPOD_ACCESSORY_PROTOCOL |
212 | #define HAVE_SERIAL | 216 | #define HAVE_SERIAL |
213 | 217 | ||
214 | #ifndef BOOTLOADER | ||
215 | /* The same code may also be used when shutting down the iPod */ | ||
216 | #define HAVE_LCD_SHUTDOWN | ||
217 | #endif | ||
218 | |||
219 | #endif | 218 | #endif |
diff --git a/uisimulator/uisimulator.make b/uisimulator/uisimulator.make index 9aeb02cd3d..121f31e0f6 100644 --- a/uisimulator/uisimulator.make +++ b/uisimulator/uisimulator.make | |||
@@ -28,8 +28,9 @@ $(SIMLIB): $$(SIMOBJ) $(UIBMP) | |||
28 | $(SILENT)$(shell rm -f $@) | 28 | $(SILENT)$(shell rm -f $@) |
29 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null | 29 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null |
30 | 30 | ||
31 | $(BUILDDIR)/$(BINARY): $$(OBJ) $(FIRMLIB) $(SIMLIB) $(VOICESPEEXLIB) | 31 | # SIMLIB needs to be linked twice for some reason |
32 | $(call PRINTS,LD $(BINARY))$(CC) -o $@ $^ $(LDOPTS) | 32 | $(BUILDDIR)/$(BINARY): $$(OBJ) $(SIMLIB) $(VOICESPEEXLIB) $(FIRMLIB) |
33 | $(call PRINTS,LD $(BINARY))$(CC) -o $@ $^ $(SIMLIB) $(LDOPTS) | ||
33 | 34 | ||
34 | $(BUILDDIR)/uisimulator/%.o: $(ROOTDIR)/uisimulator/%.c | 35 | $(BUILDDIR)/uisimulator/%.o: $(ROOTDIR)/uisimulator/%.c |
35 | $(SILENT)mkdir -p $(dir $@) | 36 | $(SILENT)mkdir -p $(dir $@) |