summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Chapman <dave@dchapman.com>2006-02-02 21:39:09 +0000
committerDave Chapman <dave@dchapman.com>2006-02-02 21:39:09 +0000
commit3749d1ad298abea9235820dce64c45d1276de8e8 (patch)
tree5d30118d9e9a9b80c00aa1e29599ee2350f00a73
parentd9e5b67b71cf246c11da8a9083af21752ac7bd15 (diff)
downloadrockbox-3749d1ad298abea9235820dce64c45d1276de8e8.tar.gz
rockbox-3749d1ad298abea9235820dce64c45d1276de8e8.zip
Oops - fix the builds broken by the backdrop image patch
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8537 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/gui/gwps-common.c4
-rw-r--r--apps/gui/gwps.c4
-rw-r--r--apps/onplay.c5
-rw-r--r--apps/settings.c2
4 files changed, 12 insertions, 3 deletions
diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c
index 09c271b904..2f9a7b3cbf 100644
--- a/apps/gui/gwps-common.c
+++ b/apps/gui/gwps-common.c
@@ -37,7 +37,6 @@
37#include "backlight.h" 37#include "backlight.h"
38#include "lang.h" 38#include "lang.h"
39#include "misc.h" 39#include "misc.h"
40#include "backdrop.h"
41#include "splash.h" 40#include "splash.h"
42#include "scrollbar.h" 41#include "scrollbar.h"
43#include "led.h" 42#include "led.h"
@@ -48,6 +47,9 @@
48#include "bmp.h" 47#include "bmp.h"
49#include "atoi.h" 48#include "atoi.h"
50#endif 49#endif
50#ifdef HAVE_LCD_COLOR
51#include "backdrop.h"
52#endif
51 53
52#ifdef HAVE_LCD_CHARCELLS 54#ifdef HAVE_LCD_CHARCELLS
53static bool draw_player_progress(struct gui_wps *gwps); 55static bool draw_player_progress(struct gui_wps *gwps);
diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c
index 00d7aaa507..e31ac12110 100644
--- a/apps/gui/gwps.c
+++ b/apps/gui/gwps.c
@@ -52,8 +52,10 @@
52#include "onplay.h" 52#include "onplay.h"
53#include "abrepeat.h" 53#include "abrepeat.h"
54#include "playback.h" 54#include "playback.h"
55#include "backdrop.h"
56#include "splash.h" 55#include "splash.h"
56#ifdef HAVE_LCD_COLOR
57#include "backdrop.h"
58#endif
57 59
58#define WPS_DEFAULTCFG WPS_DIR "/rockbox_default.wps" 60#define WPS_DEFAULTCFG WPS_DIR "/rockbox_default.wps"
59#define RWPS_DEFAULTCFG WPS_DIR "/rockbox_default.rwps" 61#define RWPS_DEFAULTCFG WPS_DIR "/rockbox_default.rwps"
diff --git a/apps/onplay.c b/apps/onplay.c
index c994b04695..167889e824 100644
--- a/apps/onplay.c
+++ b/apps/onplay.c
@@ -49,8 +49,9 @@
49#include "action.h" 49#include "action.h"
50#include "splash.h" 50#include "splash.h"
51#include "yesno.h" 51#include "yesno.h"
52#ifdef HAVE_LCD_COLOR
52#include "backdrop.h" 53#include "backdrop.h"
53 54#endif
54#ifdef HAVE_LCD_BITMAP 55#ifdef HAVE_LCD_BITMAP
55#include "icons.h" 56#include "icons.h"
56#endif 57#endif
@@ -538,7 +539,9 @@ int onplay(char* file, int attr, int from)
538{ 539{
539 struct menu_item items[8]; /* increase this if you add entries! */ 540 struct menu_item items[8]; /* increase this if you add entries! */
540 int m, i=0, result; 541 int m, i=0, result;
542#if HAVE_LCD_COLOR
541 char *suffix; 543 char *suffix;
544#endif
542 545
543 onplay_result = ONPLAY_OK; 546 onplay_result = ONPLAY_OK;
544 context=from; 547 context=from;
diff --git a/apps/settings.c b/apps/settings.c
index ebde692896..3d94df3e4c 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -72,7 +72,9 @@
72#include "statusbar.h" 72#include "statusbar.h"
73#include "splash.h" 73#include "splash.h"
74#include "list.h" 74#include "list.h"
75#if HAVE_LCD_COLOR
75#include "backdrop.h" 76#include "backdrop.h"
77#endif
76 78
77#if CONFIG_CODEC == MAS3507D 79#if CONFIG_CODEC == MAS3507D
78void dac_line_in(bool enable); 80void dac_line_in(bool enable);