len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 02:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix reds. libuisimulator.a apparently needs to be linked twice (aka quick fix as I don't know a better solution yet) :/

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20830 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2009-04-29 22:58:56 +00:00
parent a7f4e1f1c5
commit 23e505b32b
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
firmware/export/config-ipodvideo.h
View file

@ -91,9 +91,13 @@
#define HAVE_BACKLIGHT #define HAVE_BACKLIGHT
#define HAVE_BACKLIGHT_BRIGHTNESS #define HAVE_BACKLIGHT_BRIGHTNESS
#ifndef BOOTLOADER
/* Support for LCD sleep/BCM shutdown */ /* Support for LCD sleep/BCM shutdown */
#define HAVE_LCD_SLEEP #define HAVE_LCD_SLEEP
#define HAVE_LCD_SLEEP_SETTING #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 */ /* We can fade the backlight by using PWM */
#define CONFIG_BACKLIGHT_FADING BACKLIGHT_FADING_PWM #define CONFIG_BACKLIGHT_FADING BACKLIGHT_FADING_PWM
@ -211,9 +215,4 @@
#define IPOD_ACCESSORY_PROTOCOL #define IPOD_ACCESSORY_PROTOCOL
#define HAVE_SERIAL #define HAVE_SERIAL
#ifndef BOOTLOADER
/* The same code may also be used when shutting down the iPod */
#define HAVE_LCD_SHUTDOWN
#endif
#endif #endif

5
uisimulator/uisimulator.make
View file

@ -28,8 +28,9 @@ $(SIMLIB): $$(SIMOBJ) $(UIBMP)
$(SILENT)$(shell rm -f $@) $(SILENT)$(shell rm -f $@)
$(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
$(BUILDDIR)/$(BINARY): $$(OBJ) $(FIRMLIB) $(SIMLIB) $(VOICESPEEXLIB) # SIMLIB needs to be linked twice for some reason
$(call PRINTS,LD $(BINARY))$(CC) -o $@ $^ $(LDOPTS) $(BUILDDIR)/$(BINARY): $$(OBJ) $(SIMLIB) $(VOICESPEEXLIB) $(FIRMLIB)
$(call PRINTS,LD $(BINARY))$(CC) -o $@ $^ $(SIMLIB) $(LDOPTS)
$(BUILDDIR)/uisimulator/%.o: $(ROOTDIR)/uisimulator/%.c $(BUILDDIR)/uisimulator/%.o: $(ROOTDIR)/uisimulator/%.c
$(SILENT)mkdir -p $(dir $@) $(SILENT)mkdir -p $(dir $@)